Changeset 5532

Timestamp:

10/26/07 16:07:17 (6 years ago)

Author:

jgaeddert

Message:

PACKET_RS_512 can now create/extract packets of variable length input data (up to 512); output is still always 1024

Location:

experimental/components/Packetizer/trunk/Packetizer-metadata

Files:

• src/PacketizerDSP.cpp (modified) (10 diffs)
• src/PacketizerDSP.h (modified) (2 diffs)
• tests/CreateExtract_testsuite.h (modified) (1 diff)

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

@@ -189 +189 @@
         packet_subheader_length = 21;
         packet_data_length = 400;
+        packet_data_length_trunc = 400;
         packet_data_length_encoded = 400;
         break;
@@ -196 +197 @@
         packet_subheader_length = 213;
         packet_data_length = 512;
+        packet_data_length_trunc = 512;
         packet_data_length_encoded = 720;
         fec_inner = RS_4_15_11;
@@ -221 +223 @@
         packet_subheader_length = 21;
         packet_data_length = 400;
+        packet_data_length_trunc = 400;
         packet_data_length_encoded = 400;
         break;
@@ -227 +230 @@
         packet_subheader_length = 213;
         packet_data_length = 512;
+        packet_data_length_trunc = 512;
         packet_data_length_encoded = 720;
         fec_inner = RS_4_15_11;
@@ -255 +259 @@
     unsigned int encoded_packet_length;
     unsigned int nr;
+
+    if (input_length != packet_data_length) {
+        packet_data_length_trunc = input_length;
+    }
+
     EncodePacketData(
         input,
@@ -414 +423 @@
         
         op_mode = FIND_HEADER;
+
+        // truncate output appropriately
+        num_written = packet_data_length_trunc;
 
         if ( success ) {
@@ -574 +586 @@
     buf1[7] = (port_id >> 0 ) & 0xFF;
 
-    buf1[8] = (packet_data_length >> 0 ) & 0xFF;
-    buf1[9] = (packet_data_length >> 8 ) & 0xFF;
+    buf1[8] = (packet_data_length_trunc >> 0 ) & 0xFF;
+    buf1[9] = (packet_data_length_trunc >> 8 ) & 0xFF;
 
     buf1[10] = 7;
@@ -840 +852 @@
     port_id |= buf2[7];
 
-    packet_data_length = 0;
-    packet_data_length |= buf2[8];
-    packet_data_length |= buf2[9];
+    packet_data_length_trunc = 0;
+    packet_data_length_trunc |= (buf2[8] << 0);
+    packet_data_length_trunc |= (buf2[9] << 8);
+
+    // packet_data_length_trunk is at maximum packet_data_length
+    packet_data_length_trunc = 
+        (packet_data_length_trunc > packet_data_length) ? 
+         packet_data_length : packet_data_length_trunc;
 
     return true;
@@ -972 +989 @@
     unsigned int nw;
 
+    // check input
+    if (input_length > packet_data_length) {
+        std::cerr << "WARNING! PacketEncoder::EncodePacketData_PACKET_RS_512() " << std::endl
+                  << "  => input data length (" << input_length << ") exceeds maximum (512)" << std::endl;
+        return false;
+    }
+
     // 1. pack data into symbols
     // 512 1-bit symbols -> 128 4-bit symbols
-    SigProc::repack_bytes(input, 1, 512, buf2, 4, buf_len, &nw);
+    SigProc::repack_bytes(input, 1, input_length, buf2, 4, buf_len, &nw);
+    // pad buffer to be 512 bits long
+    for (unsigned int i=nw; i<packet_data_length; i++)
+        buf2[i] = rand() & 0x01;
 
     // 2. add crc/checksum: 16-bit checksum
@@ -1007 +1034 @@
     // 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);
-    num_read = 512;
+    num_read = input_length;
 
     return true;

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

@@ -145 +145 @@
 
     // Application layer definitions
-    unsigned long app_id;       ///< port identifier
+    unsigned long app_id;       ///< application identifier
 
   protected:
@@ -151 +151 @@
 
     bool dynamic_packet_size;
-    unsigned int packet_header_length;
-    unsigned int packet_subheader_length;
-    unsigned int packet_data_length;
-    unsigned int packet_data_length_encoded;
+    unsigned int packet_header_length;          ///< num bits in packet header
+    unsigned int packet_subheader_length;       ///< num bits in packet subheader
+    unsigned int packet_data_length;            ///< num uncoded data bits in packet
+    unsigned int packet_data_length_trunc;      ///< num uncoded data bits in packet (truncated)
+    unsigned int packet_data_length_encoded;    ///< num total encoded data bits
 
     // Physical layer definitions

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

@@ -151 +151 @@
     }
 
+    //
+    // Test for creating and extracting a truncated packet of type PACKET_RS_512
+    // 
+    void test_CreateExtract_PACKET_RS_512_02() {
+        PacketEncoder p;
+        PacketDecoder d;
+
+        // generate truncated input buffer
+        unsigned char input[147];
+        for (unsigned int i=0; i<147; i++)
+            input[i] = rand() & 0x01;
+
+        // generate packet buffer
+        unsigned char packet[2048];
+        memset( packet, 0x01, 2048*sizeof(char) );
+        unsigned int nr;
+        unsigned int nw;
+
+        // generate output buffer
+        unsigned char output[2048];
+        memset( output, 0xFF, 2048*sizeof(char) );
+
+        // Initialize properties
+        p.packet_id = 32768;
+        p.src_id = 247;
+        p.dst_id = 129;
+        p.port_id = 189;
+        p.app_id = 10;
+        p.ConfigurePacketType( PACKET_RS_512 );
+
+        // encode packet data
+        
+        p.CreatePacket( input, 147, nr, &packet[0], 2048, nw );
+        TS_ASSERT_EQUALS( nr, 147 );
+        TS_ASSERT_EQUALS( nw, 1024 );
+
+        // extract and decode packet data
+
+        bool packet_extracted;
+        d.packet_id = 0;
+        d.src_id = 0;
+        d.dst_id = 0;
+        d.port_id = 0;
+        d.app_id = 0;
+        packet_extracted = d.ExtractPacket(packet, 2048, nr, output, 2048, nw);
+
+        TS_ASSERT_EQUALS( packet_extracted, true );
+        TS_ASSERT_EQUALS( d.packet_id, p.packet_id );
+        TS_ASSERT_EQUALS( d.src_id, p.src_id );
+        TS_ASSERT_EQUALS( d.dst_id, p.dst_id );
+        TS_ASSERT_EQUALS( d.port_id, p.port_id );
+        TS_ASSERT_EQUALS( d.app_id, p.app_id );
+        TS_ASSERT_EQUALS( nr, 1024 );
+        TS_ASSERT_EQUALS( nw, 147 );
+        TS_ASSERT_SAME_DATA( input, output, 147 );
+
+    }
+
 };