adjusted nin for wider ange required by acquisition, #define FILE_MODE working in...

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

diff --git a/codec2-dev/src/ofdm.c b/codec2-dev/src/ofdm.c
index f110c5de1446c85d91aa247c02320c8b443b86b4..515891d20f1396d5bbfaa3cb363c2314e8de3774 100644 (file)
--- a/codec2-dev/src/ofdm.c
+++ b/codec2-dev/src/ofdm.c
@@ -430,7 +430,7 @@ int ofdm_get_samples_per_frame() {
 }
 
 int ofdm_get_max_samples_per_frame() {
-    return OFDM_MAX_SAMPLESPERFRAME;
+    return 2*OFDM_MAX_SAMPLESPERFRAME;
 }
 
 int ofdm_get_bits_per_frame(struct OFDM *ofdm) {

diff --git a/codec2-dev/unittest/tofdm.c b/codec2-dev/unittest/tofdm.c
index 19aeda991939f4e90a33cce5c5f14f38b3d4d6d0..94872bfad8717a193adc206218d159e869998a53 100644 (file)
--- a/codec2-dev/unittest/tofdm.c
+++ b/codec2-dev/unittest/tofdm.c
@@ -197,10 +197,13 @@ int main(int argc, char *argv[])
 
     int  lnew;
     COMP rxbuf_in[max_samples_per_frame];
-    
+
+    #define FRONT_LOAD
+    #ifdef FRONT_LOAD
     for (i=0; i<nin; i++,prx++) {
          ofdm->rxbuf[OFDM_RXBUF-nin+i] = rx_log[prx].real + I*rx_log[prx].imag;
     }
+    #endif
     
     int nin_tot = 0;
 
@@ -211,13 +214,13 @@ int main(int argc, char *argv[])
     ofdm_set_foff_est_enable(ofdm, true);
     ofdm_set_phase_est_enable(ofdm, true);
 
+    //#define TESTING_FILE
     #ifdef TESTING_FILE
     FILE *fin=fopen("/home/david/codec2-dev/build_linux/src/ofdm_c_test.raw", "rb");
     assert(fin != NULL);
     int Nbitsperframe = ofdm_get_bits_per_frame(ofdm);
     int Nmaxsamperframe = ofdm_get_max_samples_per_frame();
     short rx_scaled[Nmaxsamperframe];
-    COMP rx[Nmaxsamperframe];
     #endif
     
     for(f=0; f<NFRAMES; f++) {
@@ -253,11 +256,11 @@ int main(int argc, char *argv[])
         #ifdef TESTING_FILE
         fread(rx_scaled, sizeof(short), nin, fin);
         for(i=0; i<nin; i++) {
-           rx[i].real = (float)rx_scaled[i]/ASCALE;
-            rx[i].imag = 0.0;
+           rxbuf_in[i].real = (float)rx_scaled[i]/ASCALE;
+            rxbuf_in[i].imag = 0.0;
         }
-        ofdm_demod(ofdm, rx_bits, rx);
-        #else
+        #endif
+        
         next_state = state;
         switch(state) {
         case OFDM_SEARCH:
@@ -270,15 +273,16 @@ int main(int argc, char *argv[])
             break;
         }
         state = next_state;
-        #endif
         
+        #ifdef TESTING_FILE
         int Nerrs = 0;
-        for(i=0; i<OFDM_BITSPERFRAME; i++) {
+        for(i=0; i<Nbitsperframe; i++) {
             if (test_bits_ofdm[i] != rx_bits[i]) {
                 Nerrs++;
             }
         }
-        //printf("f: %d Nerr: %d\n", f, Nerrs);
+        printf("f: %d Nerr: %d\n", f, Nerrs);
+        #endif
         
         /* rx vector logging -----------------------------------*/