changes for complex input demod

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

diff --git a/codec2-dev/unittest/tfdmdv.c b/codec2-dev/unittest/tfdmdv.c
index 50848e465d0c09a5de14481cee1534ea61398ff9..f9c09cb57984b4a328fade8fd99269cb9a982f5b 100644 (file)
--- a/codec2-dev/unittest/tfdmdv.c
+++ b/codec2-dev/unittest/tfdmdv.c
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     COMP          tx_fdm[M];
     float         channel[CHANNEL_BUF_SIZE];
     int           channel_count;
-    float         rx_fdm[M+M/P];
+    COMP          rx_fdm[M+M/P];
     float         foff_coarse;
     int           nin, next_nin;
     COMP          rx_fdm_fcorr[M+M/P];
@@ -138,8 +138,10 @@ int main(int argc, char *argv[])
 
        /* take nin samples from start of buffer */
 
-       for(i=0; i<nin; i++)
-           rx_fdm[i] = channel[i];
+       for(i=0; i<nin; i++) {
+           rx_fdm[i].real = channel[i];
+            rx_fdm[i].imag = 0;
+        }
 
        /* shift buffer back */
 
@@ -156,7 +158,7 @@ int main(int argc, char *argv[])
        foff_coarse = rx_est_freq_offset(fdmdv, rx_fdm, nin);
        if (fdmdv->coarse_fine == COARSE)
            fdmdv->foff = foff_coarse;
-       freq_shift(rx_fdm_fcorr, rx_fdm, fdmdv->foff, &fdmdv->foff_rect, &fdmdv->foff_phase_rect, nin);
+       fdmdv_freq_shift(rx_fdm_fcorr, rx_fdm, fdmdv->foff, &fdmdv->foff_rect, &fdmdv->foff_phase_rect, nin);
        
        /* baseband processing */