Changeset 10639

Timestamp:

03/28/11 09:53:27 (2 years ago)

Author:

jgaeddert

Message:

updating components to work with liquid-dsp HEAD

Location:

ossiedev/branches/jgaeddert/0.8.0/components

Files:

• include/PacketDecoder.h (modified) (1 diff)
• include/PacketEncoder.h (modified) (1 diff)
• src/FlexframeGen.cpp (modified) (1 diff)
• src/FlexframeSync.cpp (modified) (3 diffs)
• src/PacketDecoder.cpp (modified) (3 diffs)
• src/PacketEncoder.cpp (modified) (2 diffs)

ossiedev/branches/jgaeddert/0.8.0/components/include/PacketDecoder.h

@@ -92 +92 @@
     // dsp objects
     packetizer p;               ///< packetizer object
+    crc_scheme check;           ///< data validity check (e.g. CRC)
     fec_scheme fec_inner;       ///< inner FEC scheme
     fec_scheme fec_outer;       ///< outer FEC scheme

ossiedev/branches/jgaeddert/0.8.0/components/include/PacketEncoder.h

@@ -91 +91 @@
     // dsp objects
     packetizer p;               ///< packetizer object
+    crc_scheme check;           ///< data validity check (e.g. CRC)
     fec_scheme fec_inner;       ///< inner FEC scheme
     fec_scheme fec_outer;       ///< outer FEC scheme

ossiedev/branches/jgaeddert/0.8.0/components/src/FlexframeGen.cpp

@@ -62 +62 @@
     float dt = 0;
 
-    interp = interp_crcf_create_rrc(k,m,beta,dt);
+    interp = interp_crcf_create_rnyquist(LIQUID_RNYQUIST_RRC,k,m,beta,dt);
 
     interp2 = resamp2_crcf_create(37,0,60);

ossiedev/branches/jgaeddert/0.8.0/components/src/FlexframeSync.cpp

@@ -37 +37 @@
                     unsigned char * _payload,
                     unsigned int _payload_len,
+                    int _payload_valid,
                     framesyncstats_s _stats,
                     void * _userdata);
@@ -308 +309 @@
                     unsigned char * _payload,
                     unsigned int _payload_len,
+                    int _payload_valid,
                     framesyncstats_s _stats,
                     void * _userdata)
@@ -317 +319 @@
         printf("callback invoked\n");
 
-        printf("  header crc          : %s\n", _header_valid ?  "pass" : "FAIL");
-    }
-
-    if (_header_valid) {
+        printf("  header [%4s] payload [%4s]\n", _header_valid ?  "pass" : "FAIL",
+                                                 _payload_valid ? "pass" : "FAIL");
+    }
+
+    if (_header_valid && _payload_valid) {
         fs_i->PushHeaderData(_header);
         fs_i->PushPayloadData(_payload, _payload_len);

ossiedev/branches/jgaeddert/0.8.0/components/src/PacketDecoder.cpp

@@ -24 +24 @@
 
     // create DSP packetizer object
+    check     = CRC_16;
     fec_inner = FEC_NONE;
-    fec_outer = FEC_HAMMING74;
+    fec_outer = FEC_HAMMING128;
     dec_msg_len = 0;
-    enc_msg_len = packetizer_get_packet_length(dec_msg_len,fec_inner,fec_outer);
-    p = packetizer_create(dec_msg_len,fec_inner,fec_outer);
+    enc_msg_len = packetizer_compute_enc_msg_len(dec_msg_len,check,fec_inner,fec_outer);
+    p = packetizer_create(dec_msg_len,check,fec_inner,fec_outer);
 }
 
@@ -177 +178 @@
             enc_msg_len = encodedDataIn_length;
 
-            // initial estimate of dec_msg_len
-            float rate_inner = fec_get_rate(fec_inner);
-            float rate_outer = fec_get_rate(fec_outer);
-            dec_msg_len = (unsigned int)(0.8f * rate_inner * rate_outer * enc_msg_len);
-            unsigned int n;
-            do {
-                dec_msg_len++;
-                n = packetizer_get_packet_length(dec_msg_len,
-                                                 fec_inner,
-                                                 fec_outer);
-            } while (n < enc_msg_len); 
+            dec_msg_len = packetizer_compute_dec_msg_len(enc_msg_len,
+                                                         check,
+                                                         fec_inner,
+                                                         fec_outer);
+
+            // re-create packetizer object
+            p = packetizer_recreate(p,dec_msg_len,check,fec_inner,fec_outer);
+
+            // validate that encoded message lengths match
+            unsigned int n = packetizer_get_enc_msg_len(p);
 
             if (n != enc_msg_len) {
-                //std::cerr << "error: PacketDecoder cannot decode packet with this configuration" << std::endl;
                 fprintf(stderr,"error: PacketDecoder cannot decode packet with this configuration");
-                fprintf(stderr,"    fec_inner   : %2u (rate = %12.8f)\n", fec_inner, rate_inner);
-                fprintf(stderr,"    fec_outer   : %2u (rate = %12.8f)\n", fec_outer, rate_outer);
+                fprintf(stderr,"    (received %u encoded bytes, expected %u)\n", enc_msg_len, n);
+                fprintf(stderr,"    check       : %10s\n", crc_scheme_str[check][0]);
+                fprintf(stderr,"    fec_inner   : %10s\n", fec_scheme_str[fec_inner][0]);
+                fprintf(stderr,"    fec_outer   : %10s\n", fec_scheme_str[fec_outer][0]);
+                fprintf(stderr,"    dec msg len : %4u\n", dec_msg_len);
                 fprintf(stderr,"    enc msg len : %4u\n", enc_msg_len);
                 throw(0);
             }
 
-            // destroy and re-create packetizer object
-            packetizer_destroy(p);
-            p = packetizer_create(dec_msg_len,
-                                  fec_inner,
-                                  fec_outer);
         }
 
         // create buffers (not efficient to do every time)
+        // TODO : allocate buffers internally, realloc only when necessary
         unsigned char dec_msg[dec_msg_len];
         unsigned char enc_msg[enc_msg_len];
@@ -222 +220 @@
             decodedDataOut[i] = dec_msg[i];
 
+        // push decoded data packet
         portDecodedDataOut->pushPacket(decodedDataOut);
     }

ossiedev/branches/jgaeddert/0.8.0/components/src/PacketEncoder.cpp

@@ -24 +24 @@
 
     // create DSP packetizer object
+    check     = CRC_16;
     fec_inner = FEC_NONE;
-    fec_outer = FEC_HAMMING74;
+    fec_outer = FEC_HAMMING128;
     dec_msg_len = 0;
-    enc_msg_len = packetizer_get_packet_length(dec_msg_len,fec_inner,fec_outer);
-    p = packetizer_create(dec_msg_len,fec_inner,fec_outer);
+    enc_msg_len = packetizer_compute_enc_msg_len(dec_msg_len,check,fec_inner,fec_outer);
+    p = packetizer_create(dec_msg_len,check,fec_inner,fec_outer);
 }
 
@@ -179 +180 @@
             // re-compute message lengths
             dec_msg_len = decodedDataIn_length;
-            enc_msg_len = packetizer_get_packet_length(dec_msg_len,
-                                                       fec_inner,
-                                                       fec_outer);
-
-            // destroy and re-create packetizer object
-            packetizer_destroy(p);
-            p = packetizer_create(dec_msg_len,
-                                  fec_inner,
-                                  fec_outer);
+            enc_msg_len = packetizer_compute_enc_msg_len(dec_msg_len,
+                                                         check,
+                                                         fec_inner,
+                                                         fec_outer);
+
+            // re-create packetizer object
+            p = packetizer_recreate(p,
+                                    dec_msg_len,
+                                    check,
+                                    fec_inner,
+                                    fec_outer);
         }
 
         // create buffers (not efficient)
+        // TODO : allocate buffers internally, realloc only when necessary
         unsigned char dec_msg[dec_msg_len];
         unsigned char enc_msg[enc_msg_len];