From 6bccf0a07fe3b19bf74d950e58595ffabea5ac42 Mon Sep 17 00:00:00 2001
From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Tue, 19 Aug 2014 10:24:55 +0000
Subject: [PATCH] made both args shorts for 8-16 kHz sample rate conversion

git-svn-id: https://svn.code.sf.net/p/freetel/code@1810 01035d8c-6547-0410-b346-abe4f91aad63
---
 codec2-dev/src/codec2_fdmdv.h                 |  4 ++--
 codec2-dev/src/fdmdv.c                        | 16 +++++++++-------
 codec2-dev/unittest/CMakeLists.txt            |  4 ++--
 .../unittest/{t16_short_8.c => t16_8_short.c} | 19 ++++++++-----------
 4 files changed, 21 insertions(+), 22 deletions(-)
 rename codec2-dev/unittest/{t16_short_8.c => t16_8_short.c} (80%)

diff --git a/codec2-dev/src/codec2_fdmdv.h b/codec2-dev/src/codec2_fdmdv.h
index 8e8978dc..df1d3725 100644
--- a/codec2-dev/src/codec2_fdmdv.h
+++ b/codec2-dev/src/codec2_fdmdv.h
@@ -109,9 +109,9 @@ void           fdmdv_get_demod_stats(struct FDMDV *fdmdv_state, struct FDMDV_STA
 void           fdmdv_get_rx_spectrum(struct FDMDV *fdmdv_state, float mag_dB[], COMP rx_fdm[], int nin);
 
 void           fdmdv_8_to_16(float out16k[], float in8k[], int n);
-void           fdmdv_8_to_16_short(short out16k[], float in8k[], int n);
+void           fdmdv_8_to_16_short(short out16k[], short in8k[], int n);
 void           fdmdv_16_to_8(float out8k[], float in16k[], int n);
-void           fdmdv_16_short_to_8(float out8k[], short in16k[], int n);
+void           fdmdv_16_to_8_short(short out8k[], short in16k[], int n);
 
 void           fdmdv_freq_shift(COMP rx_fdm_fcorr[], COMP rx_fdm[], float foff, COMP *foff_phase_rect, int nin);
 
diff --git a/codec2-dev/src/fdmdv.c b/codec2-dev/src/fdmdv.c
index b40bad53..fd0f3554 100644
--- a/codec2-dev/src/fdmdv.c
+++ b/codec2-dev/src/fdmdv.c
@@ -1740,7 +1740,7 @@ void fdmdv_8_to_16(float out16k[], float in8k[], int n)
 
 }
 
-void fdmdv_8_to_16_short(short out16k[], float in8k[], int n)
+void fdmdv_8_to_16_short(short out16k[], short in8k[], int n)
 {
     int i,j,k,l;
     float acc;
@@ -1754,7 +1754,7 @@ void fdmdv_8_to_16_short(short out16k[], float in8k[], int n)
 	for(j=0; j<FDMDV_OS; j++) {
 	    acc = 0.0;
 	    for(k=0,l=0; k<FDMDV_OS_TAPS_16K; k+=FDMDV_OS,l++)
-		acc += fdmdv_os_filter[k+j]*in8k[i-l];
+		acc += fdmdv_os_filter[k+j]*(float)in8k[i-l];
 	    out16k[i*FDMDV_OS+j] = acc*FDMDV_OS;
 	    
 	}
@@ -1786,13 +1786,15 @@ void fdmdv_8_to_16_short(short out16k[], float in8k[], int n)
 
 void fdmdv_16_to_8(float out8k[], float in16k[], int n)
 {
-    int i,j,k;
-
+    float acc;
+    int   i,j,k;
+    
     for(i=0, k=0; k<n; i+=FDMDV_OS, k++) {
         
-	out8k[k] = 0.0;
+	acc = 0.0;
 	for(j=0; j<FDMDV_OS_TAPS_16K; j++)
-	    out8k[k] += fdmdv_os_filter[j]*in16k[i-j]; 
+	    acc += fdmdv_os_filter[j]*(float)in16k[i-j]; 
+        out8k[k] = acc;       
     }
 
     /* update filter memory */
@@ -1801,7 +1803,7 @@ void fdmdv_16_to_8(float out8k[], float in16k[], int n)
 	in16k[i] = in16k[i + n*FDMDV_OS];
 }
 
-void fdmdv_16_short_to_8(float out8k[], short in16k[], int n)
+void fdmdv_16_to_8_short(short out8k[], short in16k[], int n)
 {
     int i,j;
 
diff --git a/codec2-dev/unittest/CMakeLists.txt b/codec2-dev/unittest/CMakeLists.txt
index 89cd8b82..45bcd3d3 100644
--- a/codec2-dev/unittest/CMakeLists.txt
+++ b/codec2-dev/unittest/CMakeLists.txt
@@ -54,8 +54,8 @@ target_link_libraries(tfdmdv codec2)
 add_executable(t16_8 t16_8.c ../src/fdmdv.c ../src/kiss_fft.c)
 target_link_libraries(t16_8 codec2)
 
-add_executable(t16_short_8 t16_short_8.c ../src/fdmdv.c ../src/kiss_fft.c)
-target_link_libraries(t16_short_8 codec2)
+add_executable(t16_8_short t16_8_short.c ../src/fdmdv.c ../src/kiss_fft.c)
+target_link_libraries(t16_8_short codec2)
 
 add_executable(lspsync lspsync.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/kiss_fft.c ../src/codec2.c ../src/sine.c ../src/nlp.c ../src/postfilter.c ../src/phase.c ../src/interp.c ../src/pack.c ${CODEBOOKS})
 target_link_libraries(lspsync codec2)
diff --git a/codec2-dev/unittest/t16_short_8.c b/codec2-dev/unittest/t16_8_short.c
similarity index 80%
rename from codec2-dev/unittest/t16_short_8.c
rename to codec2-dev/unittest/t16_8_short.c
index 31a1111d..24c4d94c 100644
--- a/codec2-dev/unittest/t16_short_8.c
+++ b/codec2-dev/unittest/t16_8_short.c
@@ -1,5 +1,5 @@
 /* 
-   t16__short_8.c
+   t16_8_short.c
    David Rowe
    19 August 2014
 
@@ -31,13 +31,12 @@
 #define SINE
 
 int main() {
-    float in8k[FDMDV_OS_TAPS_8K + N8];
+    short in8k_short[FDMDV_OS_TAPS_8K + N8];
     short out16k_short[N16];
     FILE *f16;
 
     short in16k_short[FDMDV_OS_TAPS_16K + N16];
-    float out8k[N16];
-    short out8k_short[N8];
+    short out8k_short[N16];
     FILE *f8;
 
     int i,f,t,t1;
@@ -51,7 +50,7 @@ int main() {
     /* clear filter memories */
 
     for(i=0; i<FDMDV_OS_TAPS_8K; i++)
-	in8k[i] = 0.0;
+	in8k_short[i] = 0;
     for(i=0; i<FDMDV_OS_TAPS_16K; i++)
 	in16k_short[i] = 0;
 
@@ -60,16 +59,16 @@ int main() {
 
 #ifdef DC
 	for(i=0; i<N8; i++)
-	    in8k[FDMDV_OS_TAPS_8K+i] = 16000.0;
+	    in8k_short[FDMDV_OS_TAPS_8K+i] = 16000.0;
 #endif
 #ifdef SINE
 	for(i=0; i<N8; i++,t++)
-	    in8k[FDMDV_OS_TAPS_8K+i] = 8000.0*cos(TWO_PI*t*freq/FS);
+	    in8k_short[FDMDV_OS_TAPS_8K+i] = 8000.0*cos(TWO_PI*t*freq/FS);
 #endif
 
 	/* upsample  */
 
-	fdmdv_8_to_16_short(out16k_short, &in8k[FDMDV_OS_TAPS_8K], N8);
+	fdmdv_8_to_16_short(out16k_short, &in8k_short[FDMDV_OS_TAPS_8K], N8);
 
 	fwrite(out16k_short, sizeof(short), N16, f16);
 	
@@ -81,12 +80,10 @@ int main() {
 
 	/* downsample */
 
-	fdmdv_16_short_to_8(out8k, &in16k_short[FDMDV_OS_TAPS_16K], N8);
+	fdmdv_16_to_8_short(out8k_short, &in16k_short[FDMDV_OS_TAPS_16K], N8);
 
 	/* save 8k to disk for plotting and check out */
 
-	for(i=0; i<N8; i++)
-	    out8k_short[i] = (short)out8k[i];
 	fwrite(out8k_short, sizeof(short), N8, f8);
 	
     }
-- 
2.25.1