diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-07-08 10:16:46 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-07-08 10:16:46 -0400 |
| commit | 664c4cc11da6e4f0b0e2de536fc571f076fe075a (patch) | |
| tree | 358154c24a32d89ab1649400079b14ada0f1b4cc /gr-vocoder/python | |
| parent | 52eb89c5c87ebccd8a7c3a5294880d367a21691a (diff) | |
vocoder: make vocoder depend on gr-filter (and by proxy gr-fft).
Diffstat (limited to 'gr-vocoder/python')
| -rw-r--r-- | gr-vocoder/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-vocoder/python/cvsd.py | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt index ee3765d5e7..32f69f2b69 100644 --- a/gr-vocoder/python/CMakeLists.txt +++ b/gr-vocoder/python/CMakeLists.txt @@ -43,6 +43,8 @@ foreach(py_qa_test_file ${py_qa_test_files}) ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig ${CMAKE_BINARY_DIR}/gr-vocoder/python ${CMAKE_BINARY_DIR}/gr-vocoder/swig + ${CMAKE_BINARY_DIR}/gr-filter/python + ${CMAKE_BINARY_DIR}/gr-filter/swig ) set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-vocoder) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) diff --git a/gr-vocoder/python/cvsd.py b/gr-vocoder/python/cvsd.py index e9b3ee3054..0b38615f41 100644 --- a/gr-vocoder/python/cvsd.py +++ b/gr-vocoder/python/cvsd.py @@ -23,6 +23,11 @@ from gnuradio import gr import vocoder_swig +try: + from gnuradio import filter +except ImportError: + import filter_swig as filter + class cvsd_encode_fb(gr.hier_block2): ''' This is a wrapper for the CVSD encoder that performs interpolation and filtering @@ -47,8 +52,8 @@ class cvsd_encode_fb(gr.hier_block2): self.interp = resample src_scale = gr.multiply_const_ff(scale_factor) - taps = gr.firdes.low_pass(self.interp, self.interp, bw, 2*bw) - interp = gr.interp_fir_filter_fff(self.interp, taps) + taps = filter.firdes.low_pass(self.interp, self.interp, bw, 2*bw) + interp = filter.interp_fir_filter_fff(self.interp, taps) f2s = gr.float_to_short() enc = vocoder_swig.cvsd_encode_sb() @@ -79,8 +84,8 @@ class cvsd_decode_bf(gr.hier_block2): dec = vocoder_swig.cvsd_decode_bs() s2f = gr.short_to_float() - taps = gr.firdes.low_pass(1, 1, bw, 2*bw) - decim = gr.fir_filter_fff(self.decim, taps) + taps = filter.firdes.low_pass(1, 1, bw, 2*bw) + decim = filter.fir_filter_fff(self.decim, taps) sink_scale = gr.multiply_const_ff(1.0/scale_factor) self.connect(self, dec, s2f, decim, sink_scale, self) |