From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Wed, 7 Nov 2012 02:25:44 +0000 (+0000)
Subject: changes for complex input demod
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=c996a20cbdf174dd1082699b9b067308a45ffbe5;p=freetel-svn-tracking.git

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 50848e46..f9c09cb5 100644
--- 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 */