[Commit-gnuradio] r5155 - gnuradio/trunk/gr-atsc/src/lib

[cswiger]

Author: cswiger
Date: 2007-04-27 11:36:29 -0600 (Fri, 27 Apr 2007)
New Revision: 5155

Modified:
   gnuradio/trunk/gr-atsc/src/lib/atsc_equalizer.cc
   gnuradio/trunk/gr-atsc/src/lib/atsc_equalizer.h
Log:
Fixed filter delay offset pointers in atsc_equalizer


Modified: gnuradio/trunk/gr-atsc/src/lib/atsc_equalizer.cc
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/atsc_equalizer.cc    2007-04-27 14:11:08 UTC 
(rev 5154)
+++ gnuradio/trunk/gr-atsc/src/lib/atsc_equalizer.cc    2007-04-27 17:36:29 UTC 
(rev 5155)
@@ -59,17 +59,16 @@
 {
 
   int ntaps = d_equalizer->ntaps ();
-  int npretaps = d_equalizer->npretaps ();
 
-  assert (ntaps >= 1);
-  assert (npretaps >= 0 && npretaps < ntaps);
-
   unsigned ninputs = ninput_items_required.size();
   for (unsigned i = 0; i < ninputs; i++)
-    ninput_items_required[i] = fixed_rate_noutput_to_ninput (noutput_items);
+    ninput_items_required[i] = fixed_rate_noutput_to_ninput (noutput_items + 
ntaps);
+
+
 }
 
 
+
 int
 atsc_equalizer::work (int noutput_items,
                       gr_vector_const_void_star &input_items,
@@ -82,16 +81,25 @@
 
   assert(sizeof(float) == sizeof(atsc::syminfo));
 
+  int ntaps = d_equalizer->ntaps ();
+  int npretaps = d_equalizer->npretaps ();
 
+  assert (ntaps >= 1);
+  assert (npretaps >= 0 && npretaps < ntaps);
+
+  int offset = ntaps - npretaps - 1;
+  assert (offset >= 0 && offset < ntaps);
+
+
   // peform the actual equalization
 
-  d_equalizer->filter (in, in_tags,
+  d_equalizer->filter (in, in_tags + offset,
                        out, noutput_items);
 
   // write the output tags
 
   for (int i = 0; i < noutput_items; i++)
-    out_tags[i] = in_tags[i];
+    out_tags[i] = in_tags[i + offset];
 
   return noutput_items;
 }

Modified: gnuradio/trunk/gr-atsc/src/lib/atsc_equalizer.h
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/atsc_equalizer.h     2007-04-27 14:11:08 UTC 
(rev 5154)
+++ gnuradio/trunk/gr-atsc/src/lib/atsc_equalizer.h     2007-04-27 17:36:29 UTC 
(rev 5155)
@@ -45,6 +45,7 @@
 
 public:
   void forecast (int noutput_items, gr_vector_int &ninput_items_required);
+
   int work (int noutput_items,
            gr_vector_const_void_star &input_items,
            gr_vector_void_star &output_items);