[Commit-gnuradio] gnuradio-core ChangeLog src/lib/general/gr_pack...

[Eric Blossom]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-core
Changes by:     Eric Blossom <eb>       06/08/02 00:46:55

Modified files:
        .              : ChangeLog 
        src/lib/general: gr_packed_to_unpacked_XX.cc.t 
                         gr_unpacked_to_packed_XX.cc.t 

Log message:
        fix for multiple stream support

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/ChangeLog?cvsroot=gnuradio&r1=1.245&r2=1.246
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t?cvsroot=gnuradio&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t?cvsroot=gnuradio&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/ChangeLog,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- ChangeLog   18 Jul 2006 02:06:49 -0000      1.245
+++ ChangeLog   2 Aug 2006 00:46:55 -0000       1.246
@@ -1,3 +1,9 @@
+2006-08-01  Achilleas Anastasopoulos <address@hidden>
+
+       * src/lib/general/gr_packed_to_unpacked_XX.cc.t,
+       src/lib/general/gr_unpacked_to_packed_XX.cc.t: fixed bug in
+       multiple stream support.
+
 2006-07-06  Tom Rondeau  <address@hidden>
 
        * src/python/gnuradio/blksimpl/gmsk2.py:

Index: src/lib/general/gr_packed_to_unpacked_XX.cc.t
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/lib/general/gr_packed_to_unpacked_XX.cc.t       24 Apr 2006 21:37:40 
-0000      1.2
+++ src/lib/general/gr_packed_to_unpacked_XX.cc.t       2 Aug 2006 00:46:55 
-0000       1.3
@@ -87,12 +87,15 @@
                                        gr_vector_const_void_star &input_items,
                                        gr_vector_void_star &output_items)
 {
+  unsigned int index_tmp;
+
   assert (input_items.size() == output_items.size());
   int nstreams = input_items.size();
 
   for (int m=0; m < nstreams; m++){
     const @I_TYPE@ *in = (@I_TYPE@ *) input_items[m];
     @O_TYPE@ *out = (@O_TYPE@ *) output_items[m];
+    index_tmp = d_index;
 
     // per stream processing
 
@@ -102,8 +105,8 @@
       for (int i = 0; i < noutput_items; i++){
        //printf("here msb %d\n",i);
        @O_TYPE@ x = 0;
-       for(unsigned int j=0; j<d_bits_per_chunk; j++, d_index++)
-         x = (x<<1) | get_bit_be(in, d_index);
+       for(unsigned int j=0; j<d_bits_per_chunk; j++, index_tmp++)
+         x = (x<<1) | get_bit_be(in, index_tmp);
        out[i] = x;
       }
       break;
@@ -112,8 +115,8 @@
       for (int i = 0; i < noutput_items; i++){
        //printf("here lsb %d\n",i);
        @O_TYPE@ x = 0;
-       for(unsigned int j=0; j<d_bits_per_chunk; j++, d_index++)
-         x = (x<<1) | get_bit_le(in, d_index);
+       for(unsigned int j=0; j<d_bits_per_chunk; j++, index_tmp++)
+         x = (x<<1) | get_bit_le(in, index_tmp);
        out[i] = x;
       }
       break;
@@ -126,6 +129,7 @@
     assert(ninput_items[m] >= (int) 
((d_index+(BITS_PER_TYPE-1))>>LOG2_L_TYPE));
   }
 
+  d_index = index_tmp;
   consume_each (d_index >> LOG2_L_TYPE);
   d_index = d_index & (BITS_PER_TYPE-1);
   //printf("got to end\n");

Index: src/lib/general/gr_unpacked_to_packed_XX.cc.t
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/lib/general/gr_unpacked_to_packed_XX.cc.t       24 Apr 2006 21:37:40 
-0000      1.2
+++ src/lib/general/gr_unpacked_to_packed_XX.cc.t       2 Aug 2006 00:46:55 
-0000       1.3
@@ -78,12 +78,15 @@
                                        gr_vector_const_void_star &input_items,
                                        gr_vector_void_star &output_items)
 {
+  unsigned int index_tmp;
+
   assert (input_items.size() == output_items.size());
   int nstreams = input_items.size();
 
   for (int m=0; m< nstreams; m++) {
     const @I_TYPE@ *in = (@I_TYPE@ *) input_items[m];
     @O_TYPE@ *out = (@O_TYPE@ *) output_items[m];
+    index_tmp=d_index;
 
     // per stream processing
 
@@ -95,8 +98,8 @@
       for(int i=0;i<noutput_items;i++) {
        @O_TYPE@ tmp=0;
        for(unsigned int j=0; j<BITS_PER_TYPE; j++) {
-         tmp = (tmp<<1) | get_bit_be1(in,d_index,d_bits_per_chunk);
-         d_index++;
+         tmp = (tmp<<1) | get_bit_be1(in,index_tmp,d_bits_per_chunk);
+         index_tmp++;
        }
        out[i] = tmp;
       }
@@ -106,8 +109,8 @@
       for(int i=0;i<noutput_items;i++) {
        unsigned long tmp=0;
        for(unsigned int j=0; j<BITS_PER_TYPE; j++) {
-         tmp = (tmp>>1)| 
(get_bit_be1(in,d_index,d_bits_per_chunk)<<(BITS_PER_TYPE-1));
-         d_index++;
+         tmp = (tmp>>1)| 
(get_bit_be1(in,index_tmp,d_bits_per_chunk)<<(BITS_PER_TYPE-1));
+         index_tmp++;
        }
        out[i] = tmp;
       }
@@ -118,6 +121,7 @@
     }
   }
 
+  d_index = index_tmp;
   consume_each ((int)(d_index/d_bits_per_chunk));
   d_index = d_index%d_bits_per_chunk;