cleaned up some code after adjusting demod sample rate slip

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

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 9c6b3117c2f32011d68292a5ccf37d273913c47d..a0b2afdb50ba3b7a66f282e74d12effbdd13e962 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -1070,16 +1070,7 @@ void MainFrame::startRxStream()
         m_rxUserdata->pWFPanel = m_panelWaterfall;
         m_rxUserdata->pSPPanel = m_panelSpectrum;
 
-       // init 48 - 8 kHz sample rate conversion filter memories
-
-        for(int i = 0; i < MEM8; i++)
-        {
-            m_rxUserdata->in8k2[i] = (float)0.0;
-        }
-        for(int i = 0; i < FDMDV_OS_TAPS; i++)
-        {
-            m_rxUserdata->in48k1[i] = (float)0.0;
-        }
+       // init sample rate conversion states
 
        m_rxUserdata->insrc1 = src_new(SRC_SINC_FASTEST, 1, &src_error);
        assert(m_rxUserdata->insrc1 != NULL);
@@ -1092,7 +1083,7 @@ void MainFrame::startRxStream()
 
        // create FIFOs used to interface between different buffer sizes
 
-        m_rxUserdata->infifo1 = fifo_create(2*N48);
+        m_rxUserdata->infifo1 = fifo_create(4*N48);
 
        m_rxUserdata->outfifo1 = fifo_create(4*N48);
 
@@ -1241,20 +1232,6 @@ void MainFrame::averageData(float mag_dB[])
     }
 }
 
-#ifdef OLD
-inline void short_to_float(float out_float[], short in_short[], int n) {
-    int i;
-    for(i=0; i<n; i++)
-       out_float[i] = (float)in_short[i];
-}
-
-inline void float_to_short(short out_short[], float in_float[], int n) {
-    int i;
-    for(i=0; i<n; i++)
-       out_short[i] = (short)in_float[i];
-}
-#endif
-
 // returns number of output samples generated by resampling
 
 static int resample(SRC_STATE *src,
@@ -1318,11 +1295,6 @@ int MainFrame::rxCallback(
     short           *rptr    = (short*)inputBuffer;
     short           *wptr    = (short*)outputBuffer;
 
-    // 48 to 8 kHz sample rate conversion filter states
-
-    float           *in8k2   = cbData->in8k2;
-    float           *in48k1  = cbData->in48k1;
-
     // temp buffers re-used by tx and rx processing
 
     short           in8k_short[2*N8];
@@ -1333,7 +1305,6 @@ int MainFrame::rxCallback(
     short           outdata[MAX_FPB];
     int             nout;
 
-    int             ret;
     unsigned int    i;
     
     (void) timeInfo;
@@ -1526,6 +1497,7 @@ void MainFrame::per_frame_rx_processing(
     //  no problem for the decoded audio.
     //
 
+    //printf("state: %d sync: %d nin %d fifo_n %d\n", *state, sync_bit, *nin, fifo_n(input_fifo));
     while (fifo_read(input_fifo, input_buf, *nin) == 0)    
     {
         // demod per frame processing