diff options
author | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
---|---|---|
committer | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
commit | 254fe5e89403d4de1fa6663d09efdf946996aff3 (patch) | |
tree | 62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gr-vocoder/python/vocoder | |
parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) |
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gr-vocoder/python/vocoder')
-rw-r--r-- | gr-vocoder/python/vocoder/CMakeLists.txt | 24 | ||||
-rw-r--r-- | gr-vocoder/python/vocoder/__init__.py | 9 | ||||
-rw-r--r-- | gr-vocoder/python/vocoder/cvsd.py | 19 | ||||
-rw-r--r--[-rwxr-xr-x] | gr-vocoder/python/vocoder/qa_alaw_vocoder.py | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | gr-vocoder/python/vocoder/qa_codec2_vocoder.py | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | gr-vocoder/python/vocoder/qa_cvsd_vocoder.py | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | gr-vocoder/python/vocoder/qa_g721_vocoder.py | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | gr-vocoder/python/vocoder/qa_g723_24_vocoder.py | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | gr-vocoder/python/vocoder/qa_g723_40_vocoder.py | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | gr-vocoder/python/vocoder/qa_gsm_full_rate.py | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | gr-vocoder/python/vocoder/qa_ulaw_vocoder.py | 1 |
11 files changed, 45 insertions, 15 deletions
diff --git a/gr-vocoder/python/vocoder/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt index 9d5ec3405c..4be361c5c0 100644 --- a/gr-vocoder/python/vocoder/CMakeLists.txt +++ b/gr-vocoder/python/vocoder/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2016 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,7 +27,6 @@ GR_PYTHON_INSTALL( __init__.py cvsd.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/vocoder - COMPONENT "vocoder_python" ) ######################################################################## @@ -47,9 +46,26 @@ if(ENABLE_TESTING) ) include(GrTest) - file(GLOB py_qa_test_files "qa_*.py") + list(APPEND py_qa_test_files + qa_alaw_vocoder.py + qa_cvsd_vocoder.py + qa_g721_vocoder.py + qa_g723_24_vocoder.py + qa_g723_40_vocoder.py + qa_ulaw_vocoder.py + ) + if(LIBCODEC2_FOUND) + list(APPEND py_qa_test_files + qa_codec2_vocoder.py + ) + endif() + if(LIBGSM_FOUND) + list(APPEND py_qa_test_files + qa_gsm_full_rate.py + ) + endif() 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} ${QA_PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) + GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-vocoder/python/vocoder/__init__.py b/gr-vocoder/python/vocoder/__init__.py index 7b1b82f847..3f4c301d96 100644 --- a/gr-vocoder/python/vocoder/__init__.py +++ b/gr-vocoder/python/vocoder/__init__.py @@ -23,13 +23,16 @@ This is the gr-vocoder package. This package includes the various vocoder blocks in GNU Radio. ''' +from __future__ import absolute_import +from __future__ import unicode_literals + import os try: - from vocoder_swig import * + from .vocoder_swig import * except ImportError: dirname, filename = os.path.split(os.path.abspath(__file__)) __path__.append(os.path.join(dirname, "..", "..", "swig")) - from vocoder_swig import * + from .vocoder_swig import * -from cvsd import * +from .cvsd import * diff --git a/gr-vocoder/python/vocoder/cvsd.py b/gr-vocoder/python/vocoder/cvsd.py index b6ce822935..00a24df25f 100644 --- a/gr-vocoder/python/vocoder/cvsd.py +++ b/gr-vocoder/python/vocoder/cvsd.py @@ -20,8 +20,11 @@ # Boston, MA 02110-1301, USA. # +from __future__ import division +from __future__ import unicode_literals from gnuradio import gr, filter, blocks -import vocoder_swig +from . import vocoder_swig + class cvsd_encode_fb(gr.hier_block2): ''' @@ -39,9 +42,9 @@ class cvsd_encode_fb(gr.hier_block2): from 1 to 8. A rate of 8k with a resampling rate of 8 provides a good quality signal. ''' - gr.hier_block2.__init__(self, "cvsd_encode", - gr.io_signature(1, 1, gr.sizeof_float), # Input signature - gr.io_signature(1, 1, gr.sizeof_char)) # Output signature + gr.hier_block2.__init__(self, "cvsd_encode", + gr.io_signature(1, 1, gr.sizeof_float), # Input signature + gr.io_signature(1, 1, gr.sizeof_char)) # Output signature scale_factor = 32000.0 self.interp = resample @@ -70,9 +73,9 @@ class cvsd_decode_bf(gr.hier_block2): When using the CVSD vocoder, appropriate sampling rates are from 8k to 64k with resampling rates from 1 to 8. A rate of 8k with a resampling rate of 8 provides a good quality signal. ''' - gr.hier_block2.__init__(self, "cvsd_decode", - gr.io_signature(1, 1, gr.sizeof_char), # Input signature - gr.io_signature(1, 1, gr.sizeof_float)) # Output signature + gr.hier_block2.__init__(self, "cvsd_decode", + gr.io_signature(1, 1, gr.sizeof_char), # Input signature + gr.io_signature(1, 1, gr.sizeof_float)) # Output signature scale_factor = 32000.0 self.decim = resample @@ -81,6 +84,6 @@ class cvsd_decode_bf(gr.hier_block2): s2f = blocks.short_to_float() taps = filter.firdes.low_pass(1, 1, bw, 2*bw) decim = filter.fir_filter_fff(self.decim, taps) - sink_scale = blocks.multiply_const_ff(1.0/scale_factor) + sink_scale = blocks.multiply_const_ff(1.0 / scale_factor) self.connect(self, dec, s2f, decim, sink_scale, self) diff --git a/gr-vocoder/python/vocoder/qa_alaw_vocoder.py b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py index 4a2b4c3c8b..e2398a2016 100755..100644 --- a/gr-vocoder/python/vocoder/qa_alaw_vocoder.py +++ b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, vocoder, blocks class test_alaw_vocoder (gr_unittest.TestCase): diff --git a/gr-vocoder/python/vocoder/qa_codec2_vocoder.py b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py index 8fe3ac56b5..8c7656cb49 100755..100644 --- a/gr-vocoder/python/vocoder/qa_codec2_vocoder.py +++ b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, vocoder, blocks from gnuradio.vocoder import codec2 diff --git a/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py index 408c6b74c9..b1516e0ef8 100755..100644 --- a/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py +++ b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, vocoder, blocks, filter from gnuradio.vocoder import cvsd diff --git a/gr-vocoder/python/vocoder/qa_g721_vocoder.py b/gr-vocoder/python/vocoder/qa_g721_vocoder.py index 8808b8fede..ad1e85471f 100755..100644 --- a/gr-vocoder/python/vocoder/qa_g721_vocoder.py +++ b/gr-vocoder/python/vocoder/qa_g721_vocoder.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, vocoder, blocks class test_g721_vocoder (gr_unittest.TestCase): diff --git a/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py index c587623e1d..755cde922c 100755..100644 --- a/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py +++ b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, vocoder, blocks class test_g723_24_vocoder (gr_unittest.TestCase): diff --git a/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py index 689102237f..911de9f66f 100755..100644 --- a/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py +++ b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, vocoder, blocks class test_g723_40_vocoder (gr_unittest.TestCase): diff --git a/gr-vocoder/python/vocoder/qa_gsm_full_rate.py b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py index 69ea94bbf9..5cca230455 100755..100644 --- a/gr-vocoder/python/vocoder/qa_gsm_full_rate.py +++ b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, vocoder, blocks class test_gsm_vocoder (gr_unittest.TestCase): diff --git a/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py index 46c8d490a8..8cfc13fc05 100755..100644 --- a/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py +++ b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # + from gnuradio import gr, gr_unittest, vocoder, blocks class test_ulaw_vocoder (gr_unittest.TestCase): |