summaryrefslogtreecommitdiff
path: root/gr-vocoder/python/vocoder
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2013-03-11 23:00:26 -0700
committerBen Reynwar <ben@reynwar.net>2013-03-11 23:00:26 -0700
commit9ff970063727999752c6e2339ffb986a9f311fa6 (patch)
tree97edb0b9d772a55a4be78c3e03a0ec7cc49c4951 /gr-vocoder/python/vocoder
parent299fe976bb597c8ad09a4dbfe494db4574f7175b (diff)
vocoder: Updating testing environment.
Diffstat (limited to 'gr-vocoder/python/vocoder')
-rw-r--r--gr-vocoder/python/vocoder/CMakeLists.txt25
-rw-r--r--gr-vocoder/python/vocoder/cvsd.py12
-rwxr-xr-xgr-vocoder/python/vocoder/qa_alaw_vocoder.py7
-rwxr-xr-xgr-vocoder/python/vocoder/qa_codec2_vocoder.py7
-rwxr-xr-xgr-vocoder/python/vocoder/qa_cvsd_vocoder.py15
-rwxr-xr-xgr-vocoder/python/vocoder/qa_g721_vocoder.py7
-rwxr-xr-xgr-vocoder/python/vocoder/qa_g723_24_vocoder.py7
-rwxr-xr-xgr-vocoder/python/vocoder/qa_g723_40_vocoder.py7
-rwxr-xr-xgr-vocoder/python/vocoder/qa_gsm_full_rate.py7
-rwxr-xr-xgr-vocoder/python/vocoder/qa_ulaw_vocoder.py7
10 files changed, 38 insertions, 63 deletions
diff --git a/gr-vocoder/python/vocoder/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt
index 9fdc625280..689fddb178 100644
--- a/gr-vocoder/python/vocoder/CMakeLists.txt
+++ b/gr-vocoder/python/vocoder/CMakeLists.txt
@@ -35,22 +35,17 @@ GR_PYTHON_INSTALL(
########################################################################
if(ENABLE_TESTING)
-list(APPEND GR_TEST_PYTHON_DIRS
- ${CMAKE_BINARY_DIR}/gr-blocks/python
- ${CMAKE_BINARY_DIR}/gr-blocks/swig
- ${CMAKE_BINARY_DIR}/gr-filter/python
- ${CMAKE_BINARY_DIR}/gr-filter/swig
- ${CMAKE_BINARY_DIR}/gr-analog/python
- ${CMAKE_BINARY_DIR}/gr-analog/swig
- ${CMAKE_BINARY_DIR}/gr-vocoder/python
- ${CMAKE_BINARY_DIR}/gr-vocoder/swig
-)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-vocoder)
+ set(GR_TEST_TARGET_DEPS "")
+ set(GR_TEST_LIBRARY_DIRS "")
+ set(GR_TEST_PYTHON_DIRS
+ ${CMAKE_BINARY_DIR}/gruel/src/python
+ ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+ )
-include(GrTest)
-file(GLOB py_qa_test_files "qa_*.py")
-foreach(py_qa_test_file ${py_qa_test_files})
+ include(GrTest)
+ file(GLOB py_qa_test_files "qa_*.py")
+ foreach(py_qa_test_file ${py_qa_test_files})
get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
-endforeach(py_qa_test_file)
+ endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-vocoder/python/vocoder/cvsd.py b/gr-vocoder/python/vocoder/cvsd.py
index 1c58c33076..b6ce822935 100644
--- a/gr-vocoder/python/vocoder/cvsd.py
+++ b/gr-vocoder/python/vocoder/cvsd.py
@@ -20,19 +20,9 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr
+from gnuradio import gr, filter, blocks
import vocoder_swig
-try:
- from gnuradio import filter
-except ImportError:
- import filter_swig as filter
-
-try:
- from gnuradio import blocks
-except ImportError:
- import blocks_swig as blocks
-
class cvsd_encode_fb(gr.hier_block2):
'''
This is a wrapper for the CVSD encoder that performs interpolation and filtering
diff --git a/gr-vocoder/python/vocoder/qa_alaw_vocoder.py b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
index a8d65409e5..33fe7d9af0 100755
--- a/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+from gnuradio import gr, gr_unittest, vocoder
class test_alaw_vocoder (gr_unittest.TestCase):
@@ -35,8 +34,8 @@ class test_alaw_vocoder (gr_unittest.TestCase):
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()
+ enc = vocoder.alaw_encode_sb()
+ dec = vocoder.alaw_decode_bs()
snk = gr.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
diff --git a/gr-vocoder/python/vocoder/qa_codec2_vocoder.py b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
index 7f38904459..191ede57d8 100755
--- a/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+from gnuradio import gr, gr_unittest, vocoder
class test_codec2_vocoder (gr_unittest.TestCase):
@@ -46,8 +45,8 @@ class test_codec2_vocoder (gr_unittest.TestCase):
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()
+ enc = vocoder.codec2_encode_sp()
+ dec = vocoder.codec2_decode_ps()
snk = gr.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
diff --git a/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
index 42cb7f19b9..df0a6a5af5 100755
--- a/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
@@ -20,11 +20,8 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-from vocoder_swig import *
-from cvsd import *
-import blocks_swig as blocks
-import filter_swig as filter
+from gnuradio import gr, gr_unittest, vocoder, blocks, filter
+from gnuradio.vocoder import cvsd
class test_cvsd_vocoder (gr_unittest.TestCase):
@@ -35,10 +32,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
diff --git a/gr-vocoder/python/vocoder/qa_g721_vocoder.py b/gr-vocoder/python/vocoder/qa_g721_vocoder.py
index e6ac04e155..ba69bfeaf8 100755
--- a/gr-vocoder/python/vocoder/qa_g721_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g721_vocoder.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+from gnuradio import gr, gr_unittest, vocoder
class test_g721_vocoder (gr_unittest.TestCase):
@@ -35,8 +34,8 @@ class test_g721_vocoder (gr_unittest.TestCase):
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()
+ enc = vocoder.g721_encode_sb()
+ dec = vocoder.g721_decode_bs()
snk = gr.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
diff --git a/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
index eda9ed86bd..053b6deab3 100755
--- a/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+from gnuradio import gr, gr_unittest, vocoder
class test_g723_24_vocoder (gr_unittest.TestCase):
@@ -34,8 +33,8 @@ 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()
+ enc = vocoder.g723_24_encode_sb()
+ dec = vocoder.g723_24_decode_bs()
snk = gr.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
diff --git a/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
index db6b7538f3..d6c453f3fe 100755
--- a/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+from gnuradio import gr, gr_unittest, vocoder
class test_g723_40_vocoder (gr_unittest.TestCase):
@@ -34,8 +33,8 @@ 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()
+ enc = vocoder.g723_40_encode_sb()
+ dec = vocoder.g723_40_decode_bs()
snk = gr.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
diff --git a/gr-vocoder/python/vocoder/qa_gsm_full_rate.py b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
index 4a7692ecd4..8ae8ce06fa 100755
--- a/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
+++ b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-import vocoder_swig
+from gnuradio import gr, gr_unittest, vocoder
class test_gsm_vocoder (gr_unittest.TestCase):
@@ -48,8 +47,8 @@ class test_gsm_vocoder (gr_unittest.TestCase):
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()
+ enc = vocoder.gsm_fr_encode_sp()
+ dec = vocoder.gsm_fr_decode_ps()
snk = gr.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
diff --git a/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
index a87aae762c..d07978cfa1 100755
--- a/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
@@ -20,8 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-from vocoder_swig import *
+from gnuradio import gr, gr_unittest, vocoder
class test_ulaw_vocoder (gr_unittest.TestCase):
@@ -35,8 +34,8 @@ class test_ulaw_vocoder (gr_unittest.TestCase):
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()
+ enc = vocoder.ulaw_encode_sb()
+ dec = vocoder.ulaw_decode_bs()
snk = gr.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-19 03:36:38 +0000