new distributed UW integrated with freedv_api, ready for testing on FreeDV GUI

git-svn-id: https://svn.code.sf.net/p/freetel/code@3587 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/freedv_api.c b/codec2-dev/src/freedv_api.c
index b8f4dc2cbfab145e0080fbf2836479fae3a82812..2368d27f01c11a94568105a5ec89a94a3ef6aba6 100644 (file)
--- a/codec2-dev/src/freedv_api.c
+++ b/codec2-dev/src/freedv_api.c
@@ -1653,7 +1653,10 @@ static int freedv_comprx_700d(struct freedv *f, COMP demod_in_8kHz[], int *valid
     float *codeword_amps = f->codeword_amps;
     int    Nbitsperframe = ofdm_get_bits_per_frame(ofdm);
     int    rx_bits[Nbitsperframe];
-
+    short txt_bits[OFDM_NTXTBITS];
+    COMP  payload_syms[coded_syms_per_frame];
+    float payload_amps[coded_syms_per_frame];
+   
     bits_per_codec_frame  = codec2_bits_per_frame(f->codec2);
     bytes_per_codec_frame = (bits_per_codec_frame + 7) / 8;
     frames = f->n_codec_bits / bits_per_codec_frame;
@@ -1690,6 +1693,8 @@ static int freedv_comprx_700d(struct freedv *f, COMP demod_in_8kHz[], int *valid
     
     if ((strcmp(ofdm->sync_state,"synced") == 0) || (strcmp(ofdm->sync_state,"trial") == 0) ) {
         ofdm_demod(ofdm, rx_bits, rxbuf_in);
+        ofdm_disassemble_modem_frame(ofdm, rx_uw, payload_syms, payload_amps, txt_bits);
+
         f->sync = 1;
         ofdm_get_demod_stats(f->ofdm, &f->stats);
         f->snr_est = f->stats.snr_est;
@@ -1708,11 +1713,10 @@ static int freedv_comprx_700d(struct freedv *f, COMP demod_in_8kHz[], int *valid
         /* newest symbols at end of buffer (uses final i from last loop), note we 
            change COMP formats from what modem uses internally */
                 
-        for(i=(interleave_frames-1)*coded_syms_per_frame,j=(OFDM_NUWBITS+OFDM_NTXTBITS)/OFDM_BPS; i<interleave_frames*coded_syms_per_frame; i++,j++) {
-            codeword_symbols[i].real = crealf(ofdm->rx_np[j]);
-            codeword_symbols[i].imag = cimagf(ofdm->rx_np[j]);
-            codeword_amps[i] = ofdm->rx_amp[j];
-        }
+        for(i=(interleave_frames-1)*coded_syms_per_frame,j=0; i<interleave_frames*coded_syms_per_frame; i++,j++) {
+            codeword_symbols[i] = payload_syms[j];
+            codeword_amps[i]    = payload_amps[j];
+         }
                
         /* run de-interleaver */
                 
@@ -1782,25 +1786,16 @@ static int freedv_comprx_700d(struct freedv *f, COMP demod_in_8kHz[], int *valid
 
         } /* if interleaver synced ..... */
 
-        /* If modem is synced we can demodulate txt bits, these are
-           uninterleaved, uncoded QPSK symbols near the start of each
-           modem frame */
+        /* If modem is synced we can decode txt bits */
         
-        for(k=0, i=OFDM_NUWBITS; k<OFDM_NTXTBITS; k++,i++)  { 
+        for(k=0; k<OFDM_NTXTBITS; k++)  { 
             //fprintf(stderr, "txt_bits[%d] = %d\n", k, rx_bits[i]);
-            short arx_bit = rx_bits[i];
-            n_ascii = varicode_decode(&f->varicode_dec_states, &ascii_out, &arx_bit, 1, 1);
+            n_ascii = varicode_decode(&f->varicode_dec_states, &ascii_out, &txt_bits[k], 1, 1);
             if (n_ascii && (f->freedv_put_next_rx_char != NULL)) {
                 (*f->freedv_put_next_rx_char)(f->callback_state, ascii_out);
             }
         }
 
-        /* extract Unique Word bits */
-        
-        for(i=0; i<OFDM_NUWBITS; i++) {
-            rx_uw[i] = rx_bits[i];
-        }
-
     } /* if modem synced .... */ else {
         *valid = -1;
     }

diff --git a/codec2-dev/src/ofdm.c b/codec2-dev/src/ofdm.c
index 4c886847ab79d612e5c5d1180bb09e63e11282a2..222008c4129a1dd3cd0a5e97d1eec4bd1ca4115e 100644 (file)
--- a/codec2-dev/src/ofdm.c
+++ b/codec2-dev/src/ofdm.c
@@ -1259,7 +1259,7 @@ void ofdm_disassemble_modem_frame(struct OFDM   *ofdm,
                                   int            rx_uw[],
                                   COMP           codeword_syms[],
                                   float          codeword_amps[],
-                                  int            txt_bits[])
+                                  short          txt_bits[])
 {
   int Nsymsperframe = OFDM_BITSPERFRAME/OFDM_BPS;
   int Nuwsyms = OFDM_NUWBITS/OFDM_BPS;

diff --git a/codec2-dev/src/ofdm_demod.c b/codec2-dev/src/ofdm_demod.c
index e60f6c8ac8b828fceab49650ed06d7f63ac1ed82..0d1dd1b58121f42ca87463c462d22f9c80cb952f 100644 (file)
--- a/codec2-dev/src/ofdm_demod.c
+++ b/codec2-dev/src/ofdm_demod.c
@@ -181,7 +181,7 @@ int main(int argc, char *argv[])
     int    rx_bits[Nbitsperframe];
     char   rx_bits_char[Nbitsperframe];
     int    rx_uw[OFDM_NUWBITS];
-    int    txt_bits[OFDM_NTXTBITS];
+    short  txt_bits[OFDM_NTXTBITS];
     f = 0; Nerrs = Terrs = Tbits = Terrs2 = Tbits2 = Terrs_coded = Tbits_coded = frame_count = 0;
 
     float EsNo = 3;

diff --git a/codec2-dev/src/ofdm_internal.h b/codec2-dev/src/ofdm_internal.h
index 32dd6a77f66214cb1a5655fed5c8cdf99d72aac4..b08117b08c7ad5bef6cae4858bcd32e749587944 100644 (file)
--- a/codec2-dev/src/ofdm_internal.h
+++ b/codec2-dev/src/ofdm_internal.h
@@ -161,7 +161,7 @@ void ofdm_disassemble_modem_frame(struct OFDM   *ofdm,
                                   int            rx_uw[],
                                   COMP           codeword_syms[],
                                   float          codeword_amps[],
-                                  int            txt_bits[]);
+                                  short          txt_bits[]);
 #ifdef __cplusplus
 }
 #endif