Changeset 5519

Timestamp:

10/25/07 17:25:28 (6 years ago)

Author:

jgaeddert

Message:

allocating less subheader data to src_id, dst_id, etc.; freeing memory from rs_char

Location:

experimental/components/Packetizer/trunk/Packetizer-metadata

Files:

• src/PacketizerDSP.cpp (modified) (9 diffs)
• tests/CreateExtract_testsuite.h (modified) (1 diff)
• tests/EncodeDecodeSubheader_testsuite.h (modified) (1 diff)

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

@@ -49 +49 @@
     packet_header_length = NUM_CONTROL_CODES*PN_CONTROL_CODE_LENGTH;
 
+    // initialize buffers
     buf1 = new unsigned char[MAX_PACKET_SIZE];
     buf2 = new unsigned char[MAX_PACKET_SIZE];
@@ -533 +534 @@
     // ----         ----
     // packet_id    32
-    // src_id       16
-    // dst_id       16
-    // app_id       16
-    // port_id      16
-    // expansion    64
+    // src_id        8
+    // dst_id        8
+    // app_id        8
+    // port_id       8
+    // packet_len   16
+    // expansion    48
     buf1[0] = (packet_id >> 0)  & 0xFF;
     buf1[1] = (packet_id >> 8)  & 0xFF;
@@ -544 +546 @@
 
     buf1[4] = (src_id >> 0 ) & 0xFF;
-    buf1[5] = (src_id >> 8 ) & 0xFF;
-
-    buf1[6] = (dst_id >> 0 ) & 0xFF;
-    buf1[7] = (dst_id >> 8 ) & 0xFF;
-
-    buf1[8] = (app_id >> 0 ) & 0xFF;
-    buf1[9] = (app_id >> 8 ) & 0xFF;
-
-    buf1[10] = (port_id >> 0 ) & 0xFF;
-    buf1[11] = (port_id >> 8 ) & 0xFF;
-
+
+    buf1[5] = (dst_id >> 0 ) & 0xFF;
+
+    buf1[6] = (app_id >> 0 ) & 0xFF;
+
+    buf1[7] = (port_id >> 0 ) & 0xFF;
+
+    buf1[8] = (packet_data_length >> 0 ) & 0xFF;
+    buf1[9] = (packet_data_length >> 8 ) & 0xFF;
+
+    buf1[10] = 7;
+    buf1[11] = 7;
     buf1[12] = 7;
     buf1[13] = 7;
@@ -587 +590 @@
     rs = init_rs_char(symsize,0x43,1,1,nroots,npad);
     encode_rs_char(rs, buf1, &buf1[kk]);
+    free_rs_char(rs);
 
     // 5. unpack to output buffer
@@ -765 +769 @@
     int nerrors(0);
     nerrors = decode_rs_char(rs, buf2, 0, 0);
+    free_rs_char(rs);
 
     // 3. repack 27 6-bit symbols (-2 bits) to 20 8-bit symbols
@@ -795 +800 @@
     // ----         ----
     // packet_id    32
-    // src_id       16
-    // dst_id       16
-    // app_id       16
-    // port_id      16
-    // expansion    64
+    // src_id        8
+    // dst_id        8
+    // app_id        8
+    // port_id       8
+    // packet_len   16
+    // expansion    48
     packet_id = 0;
     packet_id = 0;
@@ -808 +814 @@
 
     src_id = 0;
-    src_id |= (buf2[4] << 0);
-    src_id |= (buf2[5] << 8);
+    src_id |= buf2[4];
 
     dst_id = 0;
-    dst_id |= (buf2[6] << 0);
-    dst_id |= (buf2[7] << 8);
+    dst_id |= buf2[5];
 
     app_id = 0;
-    app_id |= (buf2[8] << 0);
-    app_id |= (buf2[9] << 8);
+    app_id |= buf2[6];
 
     port_id = 0;
-    port_id |= (buf2[10] << 0);
-    port_id |= (buf2[11] << 8);
+    port_id |= buf2[7];
+
+    packet_data_length = 0;
+    packet_data_length |= buf2[8];
+    packet_data_length |= buf2[9];
 
     return true;
@@ -985 +991 @@
         nw += nn;
     }
+    free_rs_char(rs);
     
     // 4. unpack data: move 4-bit symbols from buf1 to 1-bit symbols in output
@@ -1075 +1082 @@
         nw += kk;
     }
+    free_rs_char(rs);
 
     // 3. calculate and compare crc/checksum (16-bit)

experimental/components/Packetizer/trunk/Packetizer-metadata/tests/CreateExtract_testsuite.h

@@ -95 +95 @@
         // Initialize properties
         p.packet_id = 32768;
-        p.src_id = 567;
+        p.src_id = 247;
         p.dst_id = 129;
-        p.port_id = 1889;
+        p.port_id = 189;
         p.app_id = 10;
         p.ConfigurePacketType( PACKET_RS_512 );

experimental/components/Packetizer/trunk/Packetizer-metadata/tests/EncodeDecodeSubheader_testsuite.h

@@ -59 +59 @@
         // Set encoder packet id property
         enc.packet_id = 68392;
-        enc.src_id = 859;
-        enc.dst_id = 906;
+        enc.src_id = 255;
+        enc.dst_id = 159;
         enc.port_id = 254;
         enc.app_id = 211;