summaryrefslogtreecommitdiff
path: root/gr-vocoder/python
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-03-17 12:24:38 -0400
committerTom Rondeau <trondeau@vt.edu>2013-03-17 15:40:32 -0400
commitd4f6b86a9bdea09c2c158b9982559a727f8c6a0b (patch)
tree60b452d387bd494b461ee78b2b0faec1fbf6e5fe /gr-vocoder/python
parentee2b700f72503d6e7f62adbfb7dff9997b9cb003 (diff)
blocks: converting references to vector source/sink, null source/sink, nop, copy, head, skiphead, vector_map, and annotator blocks to use gr-blocks.
Diffstat (limited to 'gr-vocoder/python')
-rwxr-xr-xgr-vocoder/python/qa_alaw_vocoder.py11
-rwxr-xr-xgr-vocoder/python/qa_codec2_vocoder.py11
-rwxr-xr-xgr-vocoder/python/qa_cvsd_vocoder.py22
-rwxr-xr-xgr-vocoder/python/qa_g721_vocoder.py11
-rwxr-xr-xgr-vocoder/python/qa_g723_24_vocoder.py11
-rwxr-xr-xgr-vocoder/python/qa_g723_40_vocoder.py11
-rwxr-xr-xgr-vocoder/python/qa_gsm_full_rate.py11
-rwxr-xr-xgr-vocoder/python/qa_ulaw_vocoder.py11
8 files changed, 53 insertions, 46 deletions
diff --git a/gr-vocoder/python/qa_alaw_vocoder.py b/gr-vocoder/python/qa_alaw_vocoder.py
index a8d65409e5..50b5f8844a 100755
--- a/gr-vocoder/python/qa_alaw_vocoder.py
+++ b/gr-vocoder/python/qa_alaw_vocoder.py
@@ -21,7 +21,8 @@
#
from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+import vocoder_swig as vocoder
+import blocks_swig as blocks
class test_alaw_vocoder (gr_unittest.TestCase):
@@ -34,10 +35,10 @@ class test_alaw_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (8,24,40,56,72,88,104,120,136,152,168,184,
200,216,232,248,264,280,296,312,328,344)
- src = gr.vector_source_s(data)
- enc = alaw_encode_sb()
- dec = alaw_decode_bs()
- snk = gr.vector_sink_s()
+ src = blocks.vector_source_s(data)
+ enc = vocoder.alaw_encode_sb()
+ dec = vocoder.alaw_decode_bs()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/qa_codec2_vocoder.py b/gr-vocoder/python/qa_codec2_vocoder.py
index 7f38904459..83dbc2eb87 100755
--- a/gr-vocoder/python/qa_codec2_vocoder.py
+++ b/gr-vocoder/python/qa_codec2_vocoder.py
@@ -21,7 +21,8 @@
#
from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+import vocoder_swig as vocoder
+import blocks_swig as blocks
class test_codec2_vocoder (gr_unittest.TestCase):
@@ -45,10 +46,10 @@ class test_codec2_vocoder (gr_unittest.TestCase):
31,-82,-98,-51,6,93,104,44,-5,-84,-107,-44,45,102,104,
15,-47,-107,-126,-87,-11,89,93,13,-95,-136,-187,-70,
-167,216,-70,-103,175,-284,-486)
- src = gr.vector_source_s(data)
- enc = codec2_encode_sp()
- dec = codec2_decode_ps()
- snk = gr.vector_sink_s()
+ src = blocks.vector_source_s(data)
+ enc = vocoder.codec2_encode_sp()
+ dec = vocoder.codec2_decode_ps()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/qa_cvsd_vocoder.py b/gr-vocoder/python/qa_cvsd_vocoder.py
index 42cb7f19b9..548c877526 100755
--- a/gr-vocoder/python/qa_cvsd_vocoder.py
+++ b/gr-vocoder/python/qa_cvsd_vocoder.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2007,2010,2011 Free Software Foundation, Inc.
+# Copyright 2007,2010,2011,2013 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,8 +21,8 @@
#
from gnuradio import gr, gr_unittest
-from vocoder_swig import *
-from cvsd import *
+import vocoder_swig as vocoder
+import cvsd
import blocks_swig as blocks
import filter_swig as filter
@@ -35,10 +35,10 @@ class test_cvsd_vocoder (gr_unittest.TestCase):
self.tb = None
def test001_module_load (self):
- raw_enc = cvsd_encode_sb()
- raw_dec = cvsd_decode_bs()
- hb_enc = cvsd_encode_fb()
- hb_dec = cvsd_decode_bf()
+ raw_enc = vocoder.cvsd_encode_sb()
+ raw_dec = vocoder.cvsd_decode_bs()
+ hb_enc = cvsd.cvsd_encode_fb()
+ hb_dec = cvsd.cvsd_decode_bf()
""" Disable for now
@@ -100,20 +100,20 @@ class test_cvsd_vocoder (gr_unittest.TestCase):
# WARNING: not importing analog in this QA code.
# If we enable this, we can probably just create a sin with numpy.
src = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 200, 1, 0)
- head = gr.head(gr.sizeof_float, 100)
+ head = blocks.head(gr.sizeof_float, 100)
src_scale = blocks.multiply_const_ff(scale_factor)
interp = filter.rational_resampler_fff(8, 1)
f2s = blocks.float_to_short()
- enc = cvsd_vocoder.encode_sb()
- dec = cvsd_vocoder.decode_bs()
+ enc = vocoder.cvsd_vocoder.encode_sb()
+ dec = vocoder.cvsd_vocoder.decode_bs()
s2f = blocks.short_to_float()
decim = filter.rational_resampler_fff(1, 8)
sink_scale = blocks.multiply_const_ff(1.0/scale_factor)
- sink = gr.vector_sink_f()
+ sink = blocks.vector_sink_f()
self.tb.connect(src, src_scale, interp, f2s, enc)
self.tb.connect(enc, dec, s2f, decim, sink_scale, head, sink)
diff --git a/gr-vocoder/python/qa_g721_vocoder.py b/gr-vocoder/python/qa_g721_vocoder.py
index e6ac04e155..ed53771076 100755
--- a/gr-vocoder/python/qa_g721_vocoder.py
+++ b/gr-vocoder/python/qa_g721_vocoder.py
@@ -21,7 +21,8 @@
#
from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+import vocoder_swig as vocoder
+import blocks_swig as blocks
class test_g721_vocoder (gr_unittest.TestCase):
@@ -34,10 +35,10 @@ class test_g721_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (8,24,36,52,56,64,76,88,104,124,132,148,172,
196,220,244,280,320,372,416,468,524,580,648)
- src = gr.vector_source_s(data)
- enc = g721_encode_sb()
- dec = g721_decode_bs()
- snk = gr.vector_sink_s()
+ src = blocks.vector_source_s(data)
+ enc = vocoder.g721_encode_sb()
+ dec = vocoder.g721_decode_bs()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/qa_g723_24_vocoder.py b/gr-vocoder/python/qa_g723_24_vocoder.py
index eda9ed86bd..f473e85677 100755
--- a/gr-vocoder/python/qa_g723_24_vocoder.py
+++ b/gr-vocoder/python/qa_g723_24_vocoder.py
@@ -21,7 +21,8 @@
#
from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+import vocoder_swig as vocoder
+import blocks_swig as blocks
class test_g723_24_vocoder (gr_unittest.TestCase):
@@ -33,10 +34,10 @@ class test_g723_24_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (0,16,36,40,68,104,148,220,320,512)
- src = gr.vector_source_s(data)
- enc = g723_24_encode_sb()
- dec = g723_24_decode_bs()
- snk = gr.vector_sink_s()
+ src = blocks.vector_source_s(data)
+ enc = vocoder.g723_24_encode_sb()
+ dec = vocoder.g723_24_decode_bs()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/qa_g723_40_vocoder.py b/gr-vocoder/python/qa_g723_40_vocoder.py
index db6b7538f3..e7ca4587b7 100755
--- a/gr-vocoder/python/qa_g723_40_vocoder.py
+++ b/gr-vocoder/python/qa_g723_40_vocoder.py
@@ -21,7 +21,8 @@
#
from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+import vocoder_swig as vocoder
+import blocks_swig as blocks
class test_g723_40_vocoder (gr_unittest.TestCase):
@@ -33,10 +34,10 @@ class test_g723_40_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (0,8,36,72,100,152,228,316,404,528)
- src = gr.vector_source_s(data)
- enc = g723_40_encode_sb()
- dec = g723_40_decode_bs()
- snk = gr.vector_sink_s()
+ src = blocks.vector_source_s(data)
+ enc = vocoder.g723_40_encode_sb()
+ dec = vocoder.g723_40_decode_bs()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/qa_gsm_full_rate.py b/gr-vocoder/python/qa_gsm_full_rate.py
index 4a7692ecd4..a62781ea94 100755
--- a/gr-vocoder/python/qa_gsm_full_rate.py
+++ b/gr-vocoder/python/qa_gsm_full_rate.py
@@ -21,7 +21,8 @@
#
from gnuradio import gr, gr_unittest
-import vocoder_swig
+import vocoder_swig as vocoder
+import blocks_swig as blocks
class test_gsm_vocoder (gr_unittest.TestCase):
@@ -47,10 +48,10 @@ class test_gsm_vocoder (gr_unittest.TestCase):
680,600,240,168,112,408,488,472,608,480,240,232,
208,288,480,600,616,520,176,88,184,296,392,584,
656,552,248,160,144,336,432,512,608,664)
- src = gr.vector_source_s(data)
- enc = vocoder_swig.gsm_fr_encode_sp()
- dec = vocoder_swig.gsm_fr_decode_ps()
- snk = gr.vector_sink_s()
+ src = blocks.vector_source_s(data)
+ enc = vocoder.gsm_fr_encode_sp()
+ dec = vocoder.gsm_fr_decode_ps()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/qa_ulaw_vocoder.py b/gr-vocoder/python/qa_ulaw_vocoder.py
index a87aae762c..a030e065cc 100755
--- a/gr-vocoder/python/qa_ulaw_vocoder.py
+++ b/gr-vocoder/python/qa_ulaw_vocoder.py
@@ -21,7 +21,8 @@
#
from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+import vocoder_swig as vocoder
+import blocks_swig as blocks
class test_ulaw_vocoder (gr_unittest.TestCase):
@@ -34,10 +35,10 @@ class test_ulaw_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (8,24,40,56,72,88,104,120,132,148,164,180,
196,212,228,244,260,276,292,308,324,340)
- src = gr.vector_source_s(data)
- enc = ulaw_encode_sb()
- dec = ulaw_decode_bs()
- snk = gr.vector_sink_s()
+ src = blocks.vector_source_s(data)
+ enc = vocoder.ulaw_encode_sb()
+ dec = vocoder.ulaw_decode_bs()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 05:14:21 +0000