Changeset 5492 for experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.cpp

Timestamp:

10/24/07 09:54:08 (6 years ago)

Author:

jgaeddert

Message:

fixing PACKET_RS_512 encoder/decoder for main data block

Files:

• experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.cpp (modified) (4 diffs)

experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.cpp

@@ -985 +985 @@
     for (unsigned int i=0; i<128; i++)
         ones += c_ones[(unsigned int) (buf2[i])];
-    printf("num ones: %d\n", ones);
     ones = ones % 65536;    // 2^16
     buf2[128] = ones & 0x0F;
@@ -1005 +1004 @@
     for (unsigned int i=0; i<12; i++) {
         // copy data from buf2 to buf1
-        memmove(&buf1[nw], &buf1[nr], kk);
-        nr += kk;
+        memmove(&buf1[nw], &buf2[nr], kk);
 
         // apply encoder
         encode_rs_char(rs, (unsigned char*) &buf1[nw], (unsigned char*) &buf1[nw+kk]);
+        nr += kk;
         nw += nn;
-
-        printf("%d: nr = %d, nw = %d\n",i,nr,nw);
     }
     
     // 4. unpack data: move 4-bit symbols from buf1 to 1-bit symbols in output
     SigProc::repack_bytes(buf1, 4, nw, output, 1, output_length, &num_written);
-    printf("PACKET_RS_512 finished writing %d bits (should be 720)\n", num_written);
     num_read = 512;
 
@@ -1092 +1088 @@
     nw = 0;
     nr = 0;
-    int nerrors;
-    int nerrors_total;
+    int nerrors(0);
+    int nerrors_total(0);
     for (unsigned int i=0; i<12; i++) {
         // apply decoder (no erasure knowledge)
         nerrors = decode_rs_char(rs, (unsigned char*) &buf2[nr], 0, 0);
-        printf("%d: nerrors = %d\n", i, nerrors);
-        nerrors_total += nerrors;
+        nerrors_total = nerrors_total + nerrors;
 
         // copy data from buf2 to buf1
         memmove(&buf1[nw], &buf2[nr], kk);
+
         nr += nn;
         nw += kk;
-
-        printf("%d: nr = %d, nw = %d\n",i,nr,nw);
     }
 
@@ -1113 +1107 @@
     for (unsigned int i=0; i<4; i++) {
         checksum <<= 4;
-        checksum |= buf2[nr+i];
+        checksum |= buf1[nw-i-1];
     }
     unsigned int ones(0);
     for (unsigned int i=0; i<128; i++)
         ones += c_ones[(unsigned int) (buf1[i])];
-    printf("checksum: %d, ones: %d\n", checksum, ones);
+    //printf("checksum: %d, ones: %d\n", checksum, ones);
 
     // 4. unpack data: move 4-bit symbols from buf1 to 1-bit symbols in output
-    SigProc::repack_bytes(buf1, 4, nw, output, 1, output_length, &num_written);
-    printf("PACKET_RS_512 finished writing %d bits (should be 512)\n", num_written);
-    num_read = 512;
-
-}
-
+    SigProc::repack_bytes(buf1, 4, nw-4, output, 1, output_length, &num_written);
+    num_read = 720;
+
+}
+