diff options
-rw-r--r-- | gr-vocoder/examples/alaw_audio_loopback.py | 4 | ||||
-rw-r--r-- | gr-vocoder/examples/codec2_audio_loopback.py | 4 | ||||
-rw-r--r-- | gr-vocoder/examples/cvsd_audio_loopback.py | 14 | ||||
-rw-r--r-- | gr-vocoder/examples/g721_audio_loopback.py | 4 | ||||
-rw-r--r-- | gr-vocoder/examples/g723_24_audio_loopback.py | 4 | ||||
-rw-r--r-- | gr-vocoder/examples/g723_40_audio_loopback.py | 4 | ||||
-rw-r--r-- | gr-vocoder/examples/gsm_audio_loopback.py | 4 | ||||
-rw-r--r-- | gr-vocoder/examples/ulaw_audio_loopback.py | 4 | ||||
-rw-r--r-- | gr-vocoder/python/vocoder/cvsd.py | 12 | ||||
-rw-r--r-- | gr-vocoder/python/vocoder/qa_cvsd_vocoder.py | 2 |
10 files changed, 38 insertions, 18 deletions
diff --git a/gr-vocoder/examples/alaw_audio_loopback.py b/gr-vocoder/examples/alaw_audio_loopback.py index 8f759ac092..5af109b4be 100644 --- a/gr-vocoder/examples/alaw_audio_loopback.py +++ b/gr-vocoder/examples/alaw_audio_loopback.py @@ -13,6 +13,7 @@ from gnuradio import audio from gnuradio import blocks from gnuradio import vocoder + def build_graph(): tb = gr.top_block() src = audio.source(8000) @@ -26,9 +27,10 @@ def build_graph(): tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink) return tb + if __name__ == '__main__': tb = build_graph() tb.start() - input ('Press Enter to exit: ') + input('Press Enter to exit: ') tb.stop() tb.wait() diff --git a/gr-vocoder/examples/codec2_audio_loopback.py b/gr-vocoder/examples/codec2_audio_loopback.py index e49279fc86..930bd8cf8a 100644 --- a/gr-vocoder/examples/codec2_audio_loopback.py +++ b/gr-vocoder/examples/codec2_audio_loopback.py @@ -14,6 +14,7 @@ from gnuradio import blocks from gnuradio import vocoder from gnuradio.vocoder import codec2 + def build_graph(): tb = gr.top_block() src = audio.source(8000) @@ -27,9 +28,10 @@ def build_graph(): tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink) return tb + if __name__ == '__main__': tb = build_graph() tb.start() - input ('Press Enter to exit: ') + input('Press Enter to exit: ') tb.stop() tb.wait() diff --git a/gr-vocoder/examples/cvsd_audio_loopback.py b/gr-vocoder/examples/cvsd_audio_loopback.py index aa12eedca0..79fb5e8768 100644 --- a/gr-vocoder/examples/cvsd_audio_loopback.py +++ b/gr-vocoder/examples/cvsd_audio_loopback.py @@ -14,6 +14,7 @@ from gnuradio import blocks from gnuradio import filter from gnuradio import vocoder + def build_graph(): sample_rate = 8000 scale_factor = 32000 @@ -37,22 +38,25 @@ def build_graph(): tb.connect(src, src_scale, interp, f2s, enc) tb.connect(enc, dec, s2f, decim, sink_scale, sink) - if 0: # debug + if 0: # debug tb.connect(src, blocks.file_sink(gr.sizeof_float, "source.dat")) - tb.connect(src_scale, blocks.file_sink(gr.sizeof_float, "src_scale.dat")) + tb.connect(src_scale, blocks.file_sink( + gr.sizeof_float, "src_scale.dat")) tb.connect(interp, blocks.file_sink(gr.sizeof_float, "interp.dat")) tb.connect(f2s, blocks.file_sink(gr.sizeof_short, "f2s.dat")) - tb.connect(enc, blocks.file_sink(gr.sizeof_char, "enc.dat")) + tb.connect(enc, blocks.file_sink(gr.sizeof_char, "enc.dat")) tb.connect(dec, blocks.file_sink(gr.sizeof_short, "dec.dat")) tb.connect(s2f, blocks.file_sink(gr.sizeof_float, "s2f.dat")) tb.connect(decim, blocks.file_sink(gr.sizeof_float, "decim.dat")) - tb.connect(sink_scale, blocks.file_sink(gr.sizeof_float, "sink_scale.dat")) + tb.connect(sink_scale, blocks.file_sink( + gr.sizeof_float, "sink_scale.dat")) return tb + if __name__ == '__main__': tb = build_graph() tb.start() - input ('Press Enter to exit: ') + input('Press Enter to exit: ') tb.stop() tb.wait() diff --git a/gr-vocoder/examples/g721_audio_loopback.py b/gr-vocoder/examples/g721_audio_loopback.py index ac9bdc759d..6b9261edba 100644 --- a/gr-vocoder/examples/g721_audio_loopback.py +++ b/gr-vocoder/examples/g721_audio_loopback.py @@ -13,6 +13,7 @@ from gnuradio import audio from gnuradio import blocks from gnuradio import vocoder + def build_graph(): tb = gr.top_block() src = audio.source(8000) @@ -26,9 +27,10 @@ def build_graph(): tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink) return tb + if __name__ == '__main__': tb = build_graph() tb.start() - input ('Press Enter to exit: ') + input('Press Enter to exit: ') tb.stop() tb.wait() diff --git a/gr-vocoder/examples/g723_24_audio_loopback.py b/gr-vocoder/examples/g723_24_audio_loopback.py index e755f38cd4..f8c09ccfed 100644 --- a/gr-vocoder/examples/g723_24_audio_loopback.py +++ b/gr-vocoder/examples/g723_24_audio_loopback.py @@ -13,6 +13,7 @@ from gnuradio import audio from gnuradio import blocks from gnuradio import vocoder + def build_graph(): tb = gr.top_block() src = audio.source(8000) @@ -26,9 +27,10 @@ def build_graph(): tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink) return tb + if __name__ == '__main__': tb = build_graph() tb.start() - input ('Press Enter to exit: ') + input('Press Enter to exit: ') tb.stop() tb.wait() diff --git a/gr-vocoder/examples/g723_40_audio_loopback.py b/gr-vocoder/examples/g723_40_audio_loopback.py index fbc10b871c..742dc8b36a 100644 --- a/gr-vocoder/examples/g723_40_audio_loopback.py +++ b/gr-vocoder/examples/g723_40_audio_loopback.py @@ -13,6 +13,7 @@ from gnuradio import audio from gnuradio import blocks from gnuradio import vocoder + def build_graph(): tb = gr.top_block() src = audio.source(8000) @@ -26,9 +27,10 @@ def build_graph(): tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink) return tb + if __name__ == '__main__': tb = build_graph() tb.start() - input ('Press Enter to exit: ') + input('Press Enter to exit: ') tb.stop() tb.wait() diff --git a/gr-vocoder/examples/gsm_audio_loopback.py b/gr-vocoder/examples/gsm_audio_loopback.py index fe6c6bf2ac..8edf27f87e 100644 --- a/gr-vocoder/examples/gsm_audio_loopback.py +++ b/gr-vocoder/examples/gsm_audio_loopback.py @@ -13,6 +13,7 @@ from gnuradio import audio from gnuradio import blocks from gnuradio import vocoder + def build_graph(): tb = gr.top_block() src = audio.source(8000) @@ -26,9 +27,10 @@ def build_graph(): tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink) return tb + if __name__ == '__main__': tb = build_graph() tb.start() - input ('Press Enter to exit: ') + input('Press Enter to exit: ') tb.stop() tb.wait() diff --git a/gr-vocoder/examples/ulaw_audio_loopback.py b/gr-vocoder/examples/ulaw_audio_loopback.py index 1a3fbd85cf..fcae71c1c8 100644 --- a/gr-vocoder/examples/ulaw_audio_loopback.py +++ b/gr-vocoder/examples/ulaw_audio_loopback.py @@ -13,6 +13,7 @@ from gnuradio import audio from gnuradio import blocks from gnuradio import vocoder + def build_graph(): tb = gr.top_block() src = audio.source(8000) @@ -26,9 +27,10 @@ def build_graph(): tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink) return tb + if __name__ == '__main__': tb = build_graph() tb.start() - input ('Press Enter to exit: ') + input('Press Enter to exit: ') tb.stop() tb.wait() diff --git a/gr-vocoder/python/vocoder/cvsd.py b/gr-vocoder/python/vocoder/cvsd.py index 076031e160..3ad2e35b7f 100644 --- a/gr-vocoder/python/vocoder/cvsd.py +++ b/gr-vocoder/python/vocoder/cvsd.py @@ -29,14 +29,15 @@ class cvsd_encode_fb(gr.hier_block2): ''' gr.hier_block2.__init__(self, "cvsd_encode", - gr.io_signature(1, 1, gr.sizeof_float), # Input signature + # Input signature + gr.io_signature(1, 1, gr.sizeof_float), gr.io_signature(1, 1, gr.sizeof_char)) # Output signature scale_factor = 32000.0 self.interp = resample src_scale = blocks.multiply_const_ff(scale_factor) - taps = filter.firdes.low_pass(self.interp, self.interp, bw, 2*bw) + taps = filter.firdes.low_pass(self.interp, self.interp, bw, 2 * bw) interp = filter.interp_fir_filter_fff(self.interp, taps) f2s = blocks.float_to_short() enc = vocoder_python.cvsd_encode_sb() @@ -60,15 +61,16 @@ class cvsd_decode_bf(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_decode", - gr.io_signature(1, 1, gr.sizeof_char), # Input signature - gr.io_signature(1, 1, gr.sizeof_float)) # Output signature + # Input signature + gr.io_signature(1, 1, gr.sizeof_char), + gr.io_signature(1, 1, gr.sizeof_float)) # Output signature scale_factor = 32000.0 self.decim = resample dec = vocoder_python.cvsd_decode_bs() s2f = blocks.short_to_float() - taps = filter.firdes.low_pass(1, 1, bw, 2*bw) + 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) diff --git a/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py index de5ac9f999..e44ca9bd5d 100644 --- a/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py +++ b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py @@ -104,7 +104,7 @@ class test_cvsd_vocoder (gr_unittest.TestCase): self.tb.connect(src, src_scale, interp, f2s, enc) self.tb.connect(enc, dec, s2f, decim, sink_scale, head, sink) self.tb.run() - print sink.data() + print(sink.data()) self.assertFloatTuplesAlmostEqual (expected_data, sink.data(), 5) """ |