From aaa9b2f15d1d73ba9e35d6515411d26f582f6338 Mon Sep 17 00:00:00 2001
From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Mon, 23 Apr 2012 22:09:52 +0000
Subject: [PATCH] removed ((unused)) for MSVC compat, we will need to find
 another way to handle compiler warnings

git-svn-id: https://svn.code.sf.net/p/freetel/code@377 01035d8c-6547-0410-b346-abe4f91aad63
---
 codec2-dev/src/fdmdv.c          | 114 +++++++++++++++++++++++++++++++-
 codec2-dev/src/fdmdv_internal.h |  12 +++-
 codec2-dev/src/nlp.c            |   6 +-
 codec2-dev/src/quantise.c       |  12 ++--
 codec2-dev/src/sine.c           |   2 +-
 5 files changed, 133 insertions(+), 13 deletions(-)

diff --git a/codec2-dev/src/fdmdv.c b/codec2-dev/src/fdmdv.c
index 13f6c20f..3f691d8f 100644
--- a/codec2-dev/src/fdmdv.c
+++ b/codec2-dev/src/fdmdv.c
@@ -166,10 +166,19 @@ struct FDMDV *fdmdv_create(void)
 	
 	f->phase_tx[c].real = cos(2.0*PI*c/(NC+1));
  	f->phase_tx[c].imag = sin(2.0*PI*c/(NC+1));
+
 	f->phase_rx[c].real = 1.0;
  	f->phase_rx[c].imag = 0.0;
 
-   }
+	for(k=0; k<NT*P; k++) {
+	    f->rx_filter_mem_timing[c][k].real = 0.0;
+	    f->rx_filter_mem_timing[c][k].imag = 0.0;
+	}
+ 	for(k=0; k<NFILTERTIMING; k++) {
+	    f->rx_baseband_mem_timing[c][k].real = 0.0;
+	    f->rx_baseband_mem_timing[c][k].imag = 0.0;
+	}
+  }
     
     /* Set up frequency of each carrier */
 
@@ -726,3 +735,106 @@ void rx_filter(COMP rx_filt[NC+1][P+1], COMP rx_baseband[NC+1][M+M/P], COMP rx_f
 
     assert(j <= (P+1)); /* check for any over runs */
 }
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: rx_est_timing()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 23/4/2012
+
+  Estimate optimum timing offset, re-filter receive symbols at optimum
+  timing estimate.
+
+\*---------------------------------------------------------------------------*/
+
+float rx_est_timing(COMP rx_symbols[], 
+		    COMP rx_filt[NC+1][P+1], 
+		    COMP rx_baseband[NC+1][M+M/P], 
+		    COMP rx_filter_mem_timing[NC+1][NT*P], 
+		    float env[],
+		    COMP rx_baseband_mem_timing[NC+1][NFILTERTIMING], 
+		    int nin)	 
+{
+    int   c,i,j,k;
+    int   adjust, s;
+    COMP  x, phase, freq;
+    float rx_timing;
+
+    /*
+      nin  adjust 
+      --------------------------------
+      120  -1 (one less rate P sample)
+      160   0 (nominal)
+      200   1 (one more rate P sample)
+    */
+
+    adjust = P - nin*P/M;
+
+    /* update buffer of NT rate P filtered symbols */
+    
+    for(c=0; c<NC+1; c++) 
+	for(i=0,j=P-adjust; i<(NT-1)*P+adjust; i++,j++)
+	    rx_filter_mem_timing[c][i] = rx_filter_mem_timing[c][j];
+    for(c=0; c<NC+1; c++) 
+	for(i=(NT-1)*P+adjust,j=0; i<NT*P; i++,j++)
+	    rx_filter_mem_timing[c][i] = rx_filt[c][j];
+	    
+    /* sum envelopes of all carriers */
+
+    for(i=0; i<NT*P; i++) {
+	env[i] = 0.0;
+	for(c=0; c<NC+1; c++)
+	    env[i] += sqrt(pow(rx_filter_mem_timing[c][i].real,2.0) + pow(rx_filter_mem_timing[c][i].imag,2.0));
+    }
+
+    /* The envelope has a frequency component at the symbol rate.  The
+       phase of this frequency component indicates the timing.  So work
+       out single DFT at frequency 2*pi/P */
+
+    x.real = 0.0; x.imag = 0.0;
+    freq.real = cos(2*PI/P);
+    freq.imag = sin(2*PI/P);
+    phase.real = 1.0;
+    phase.imag = 0.0;
+
+    for(i=0; i<NT*P; i++) {
+	x = cadd(x, fcmult(env[i], phase));
+	phase = cmult(phase, freq);
+    }
+
+    /* Map phase to estimated optimum timing instant at rate M.  The
+       M/4 part was adjusted by experiment, I know not why.... */
+    
+    rx_timing = atan2(x.imag, x.real)*M/(2*PI) + M/4;
+    if (rx_timing > M)
+	rx_timing -= M;
+    if (rx_timing < -M)
+	rx_timing += M;
+   
+    /* rx_filt_mem_timing contains M + Nfilter + M samples of the
+       baseband signal at rate M this enables us to resample the
+       filtered rx symbol with M sample precision once we have
+       rx_timing */
+
+    for(c=0; c<NC+1; c++) 
+	for(i=0,j=nin; i<NFILTERTIMING-nin; i++,j++)
+	    rx_baseband_mem_timing[c][i] = rx_filter_mem_timing[c][j];
+    for(c=0; c<NC+1; c++) 
+	for(i=NFILTERTIMING-nin,j=0; i<NFILTERTIMING; i++,j++)
+	    rx_baseband_mem_timing[c][i] = rx_baseband[c][j];
+
+    /* rx filter to get symbol for each carrier at estimated optimum
+       timing instant.  We use rate M filter memory to get fine timing
+       resolution. */
+
+    s = round(rx_timing) + M;
+    for(c=0; c<NC+1; c++) {
+	rx_symbols[c].real = 0.0;
+	rx_symbols[c].imag = 0.0;
+	for(k=s,j=0; k<s+NFILTER; k++,j++)
+	    rx_symbols[c] = cadd(rx_symbols[c], fcmult(gt_alpha5_root[j], rx_baseband_mem_timing[c][k]));
+    }
+    printf("rx_symbols[0] = %f %f\n", rx_symbols[0].real, rx_symbols[0].imag);
+	
+    return rx_timing;
+}
diff --git a/codec2-dev/src/fdmdv_internal.h b/codec2-dev/src/fdmdv_internal.h
index d2ffadee..eec78de0 100644
--- a/codec2-dev/src/fdmdv_internal.h
+++ b/codec2-dev/src/fdmdv_internal.h
@@ -53,7 +53,7 @@
 
 #define NT                       5  /* number of symbols we estimate timing over                            */
 #define P                        4  /* oversample factor used for initial rx symbol filtering               */
-#define NFILTERTIMING (M+Nfilter+M) /* filter memory used for resampling after timing estimation            */
+#define NFILTERTIMING (M+NFILTER+M) /* filter memory used for resampling after timing estimation            */
 
 #define NTEST_BITS        (NC*NB*4) /* length of test bit sequence */
 
@@ -91,7 +91,8 @@ struct FDMDV {
 
     COMP phase_rx[NC+1];
     COMP rx_filter_memory[NC+1][NFILTER];
-
+    COMP rx_filter_mem_timing[NC+1][NT*P];
+    COMP rx_baseband_mem_timing[NC+1][NFILTERTIMING];
 };
 
 /*---------------------------------------------------------------------------*\
@@ -109,5 +110,12 @@ float rx_est_freq_offset(struct FDMDV *f, float rx_fdm[], int nin);
 void lpf_peak_pick(float *foff, float *max, COMP pilot_baseband[], COMP pilot_lpf[], COMP S[], int nin);
 void fdm_downconvert(COMP rx_baseband[NC+1][M+M/P], COMP rx_fdm[], COMP phase_rx[], COMP freq[], int nin);
 void rx_filter(COMP rx_filt[NC+1][P+1], COMP rx_baseband[NC+1][M+M/P], COMP rx_filter_memory[NC+1][NFILTER], int nin);
+float rx_est_timing(COMP  rx_symbols[], 
+		   COMP  rx_filt[NC+1][P+1], 
+		   COMP  rx_baseband[NC+1][M+M/P], 
+		   COMP  rx_filter_mem_timing[NC+1][NT*P], 
+		   float env[],
+		   COMP  rx_baseband_mem_timing[NC+1][NFILTERTIMING], 
+		   int   nin);	 
 
 #endif
diff --git a/codec2-dev/src/nlp.c b/codec2-dev/src/nlp.c
index 11c723f0..44fc792c 100644
--- a/codec2-dev/src/nlp.c
+++ b/codec2-dev/src/nlp.c
@@ -197,10 +197,10 @@ float nlp(
   float  Sn[],			/* input speech vector */
   int    n,			/* frames shift (no. new samples in Sn[]) */
   int    m,			/* analysis window size */
-  int    pmin __attribute__((unused)), /* minimum pitch value */
+  int    pmin,                  /* minimum pitch value */
   int    pmax,			/* maximum pitch value */
   float *pitch,			/* estimated pitch period in samples */
-  COMP   Sw[] __attribute__((unused)), /* Freq domain version of Sn[] */
+  COMP   Sw[],                  /* Freq domain version of Sn[] */
   float *prev_Wo
 )
 {
@@ -307,7 +307,7 @@ float nlp(
 \*---------------------------------------------------------------------------*/
 
 float post_process_sub_multiples(COMP Fw[], 
-				 int pmin __attribute__((unused)), int pmax, float gmax, int gmax_bin,
+				 int pmin, int pmax, float gmax, int gmax_bin,
 				 float *prev_Wo)
 {
     int   min_bin, cmax_bin;
diff --git a/codec2-dev/src/quantise.c b/codec2-dev/src/quantise.c
index 8699dd33..eeb484c9 100644
--- a/codec2-dev/src/quantise.c
+++ b/codec2-dev/src/quantise.c
@@ -242,7 +242,7 @@ void lspd_quantise(
 void lspvq_quantise(
   float lsp[], 
   float lsp_[],
-  int   order __attribute__((unused))
+  int   order
 ) 
 {
     int   i,k,m,ncb, nlsp;
@@ -299,7 +299,7 @@ void lspvq_quantise(
 
 \*---------------------------------------------------------------------------*/
 
-void lspjnd_quantise(float lsps[], float lsps_[], int order __attribute__((unused))) 
+void lspjnd_quantise(float lsps[], float lsps_[], int order) 
 {
     int   i,k,m;
     float  wt[LPC_ORD], lsps_hz[LPC_ORD];
@@ -363,7 +363,7 @@ void compute_weights(const float *x, float *w, int ndim);
 
 \*---------------------------------------------------------------------------*/
 
-void lspdt_quantise(float lsps[], float lsps_[], float lsps__prev[], int mode __attribute__((unused)))
+void lspdt_quantise(float lsps[], float lsps_[], float lsps__prev[], int mode)
 {
     int   i;
     float wt[LPC_ORD];
@@ -661,7 +661,7 @@ void aks_to_M2(
   MODEL *model,	/* sinusoidal model parameters for this frame */
   float  E,	/* energy term */
   float *snr,	/* signal to noise ratio for this frame in dB */
-  int    dump __attribute__((unused)) /* true to dump sample to dump file */
+  int    dump   /* true to dump sample to dump file */
 )
 {
   COMP Pw[FFT_DEC];	/* power spectrum */
@@ -1073,7 +1073,7 @@ void decode_lsps_diff_freq_vq(float lsp_[], int indexes[], int order)
 void encode_lsps_diff_time_vq(int indexes[], 
 			      float lsps[], 
 			      float lsps__prev[], 
-			      int order __attribute__((unused)))
+			      int order)
 {
     int    i,k,m;
     float  lsps_dt[LPC_ORD];
@@ -1426,7 +1426,7 @@ float decode_amplitudes(MODEL *model,
 
 static float ge_coeff[2] = {0.8, 0.9};
 
-void compute_weights2(const float *x, const float *xp, float *w, int ndim __attribute__((unused)))
+void compute_weights2(const float *x, const float *xp, float *w, int ndim)
 {
   w[0] = 30;
   w[1] = 1;
diff --git a/codec2-dev/src/sine.c b/codec2-dev/src/sine.c
index bc73b514..a124788e 100644
--- a/codec2-dev/src/sine.c
+++ b/codec2-dev/src/sine.c
@@ -386,7 +386,7 @@ float est_voicing_mbe(
     COMP   Sw_[],         /* DFT of all voiced synthesised signal  */
                           /* useful for debugging/dump file        */
     COMP   Ew[],          /* DFT of error                          */
-    float prev_Wo __attribute__((unused)))
+    float prev_Wo)
 {
     int   i,l,al,bl,m;    /* loop variables */
     COMP  Am;             /* amplitude sample for this band */
-- 
2.25.1