[Commit-gnuradio] r8417 - gnuradio/trunk/gr-atsc/src/python

[cswiger]

Author: cswiger
Date: 2008-05-13 14:32:56 -0600 (Tue, 13 May 2008)
New Revision: 8417

Modified:
   gnuradio/trunk/gr-atsc/src/python/interp.py
   gnuradio/trunk/gr-atsc/src/python/interp_short.py
Log:
Added interp_fir_filter in place of zero sources, interleaver, filter
scheme.


Modified: gnuradio/trunk/gr-atsc/src/python/interp.py
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/interp.py 2008-05-13 14:23:45 UTC (rev 
8416)
+++ gnuradio/trunk/gr-atsc/src/python/interp.py 2008-05-13 20:32:56 UTC (rev 
8417)
@@ -44,25 +44,16 @@
        sys.stderr.write('usage: interp.py input_file\n')
        sys.exit (1)
 
-    sampling_freq = 6400000
-
     tb = gr.top_block ()
 
     src0 = gr.file_source (gr.sizeof_gr_complex,infile)
-    src1 = gr.sig_source_c (sampling_freq, gr.GR_CONST_WAVE, 1, 0)
-    src2 = gr.sig_source_c (sampling_freq, gr.GR_CONST_WAVE, 1, 0)
 
-    interlv = gr.interleave(gr.sizeof_gr_complex)
-
     lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, 
gr.firdes.WIN_HAMMING )
-    lp = gr.fir_filter_ccf ( 1, lp_coeffs )
+    lp = gr.interp_fir_filter_ccf ( 1, lp_coeffs )
 
     file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
 
-    tb.connect( src0, (interlv, 0) )
-    tb.connect( src1, (interlv, 1) )
-    tb.connect( src2, (interlv, 2) )
-    tb.connect( interlv, lp, file )
+    tb.connect( src0, lp, file )
 
     tb.start()
     raw_input ('Head End: Press Enter to stop')

Modified: gnuradio/trunk/gr-atsc/src/python/interp_short.py
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/interp_short.py   2008-05-13 14:23:45 UTC 
(rev 8416)
+++ gnuradio/trunk/gr-atsc/src/python/interp_short.py   2008-05-13 20:32:56 UTC 
(rev 8417)
@@ -27,7 +27,7 @@
 #                   -f <center of tv signal channel freq>
 #                   -g <appropriate gain for best signal / noise>
 #                   -s output shorts
-@
+#
 # All this module does is multiply the sample rate by 3, from 6.4e6 to
 # 19.2e6 complex samples / sec, then lowpass filter with a cutoff of 3.2MHz
 # and a transition band width of .5MHz.  Center of the tv channels is
@@ -45,8 +45,6 @@
        sys.stderr.write('usage: interp.py input_file\n')
        sys.exit (1)
 
-    sampling_freq = 6400000
-
     tb = tb.top_block ()
 
     srcf = gr.file_source (gr.sizeof_short,infile)
@@ -55,13 +53,9 @@
     s2f2 = gr.short_to_float()
     src0 = gr.float_to_complex()
 
-    src1 = gr.sig_source_c (sampling_freq, gr.GR_CONST_WAVE, 1, 0)
-    src2 = gr.sig_source_c (sampling_freq, gr.GR_CONST_WAVE, 1, 0)
 
-    interlv = gr.interleave(gr.sizeof_gr_complex)
-
     lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, 
gr.firdes.WIN_HAMMING )
-    lp = gr.fir_filter_ccf ( 1, lp_coeffs )
+    lp = gr.interp_fir_filter_ccf ( 3, lp_coeffs )
 
     file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
 
@@ -70,9 +64,7 @@
     tb.connect( (s2ss, 1), s2f2)
     tb.connect( s2f1, (src0,0) )
     tb.connect( s2f2, (src0,1) )
-    tb.connect( src0, (interlv, 0) )
-    tb.connect( src1, (interlv, 1) )
-    tb.connect( src2, (interlv, 2) )
+    tb.connect( src0, lp, file)
     tb.connect( interlv, lp, file )
 
     tb.start()