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);
}
-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;
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;
}
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 */
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;
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)
--- /dev/null
+/*
+ t16_8_short.c
+ David Rowe
+ 19 August 2014
+
+ Unit test for 16 to 8 kHz sample rate conversion functions. I
+ evaluated output by plotting using Octave and looking for jaggies:
+
+ pl("../unittest/out16_short.raw",1,3000)
+ pl("../unittest/out8.raw",1,3000)
+
+ Listening to it also shows up anything nasty:
+
+ $ play -s -2 -r 16000 out16_short.raw
+ $ play -s -2 -r 8000 out8.raw
+
+ */
+
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "codec2_fdmdv.h"
+
+#define N8 160 /* procssing buffer size at 8 kHz */
+#define N16 (N8*FDMDV_OS)
+#define FRAMES 100
+#define TWO_PI 6.283185307
+#define FS 16000
+
+#define SINE
+
+int main() {
+ short in8k_short[FDMDV_OS_TAPS_8K + N8];
+ short out16k_short[N16];
+ FILE *f16;
+
+ short in16k_short[FDMDV_OS_TAPS_16K + N16];
+ short out8k_short[N16];
+ FILE *f8;
+
+ int i,f,t,t1;
+ float freq = 800.0;
+
+ f16 = fopen("out16_short.raw", "wb");
+ assert(f16 != NULL);
+ f8 = fopen("out8.raw", "wb");
+ assert(f8 != NULL);
+
+ /* clear filter memories */
+
+ for(i=0; i<FDMDV_OS_TAPS_8K; i++)
+ in8k_short[i] = 0;
+ for(i=0; i<FDMDV_OS_TAPS_16K; i++)
+ in16k_short[i] = 0;
+
+ t = t1 = 0;
+ for(f=0; f<FRAMES; f++) {
+
+#ifdef DC
+ for(i=0; i<N8; i++)
+ in8k_short[FDMDV_OS_TAPS_8K+i] = 16000.0;
+#endif
+#ifdef SINE
+ for(i=0; i<N8; i++,t++)
+ 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_short[FDMDV_OS_TAPS_8K], N8);
+
+ fwrite(out16k_short, sizeof(short), N16, f16);
+
+ /* add a 6 kHz spurious signal for fun, we want down sampler to
+ knock this out */
+
+ for(i=0; i<N16; i++,t1++)
+ in16k_short[i+FDMDV_OS_TAPS_16K] = out16k_short[i] + 8000.0*cos(TWO_PI*t1*6000.0/FS);
+
+ /* downsample */
+
+ fdmdv_16_to_8_short(out8k_short, &in16k_short[FDMDV_OS_TAPS_16K], N8);
+
+ /* save 8k to disk for plotting and check out */
+
+ fwrite(out8k_short, sizeof(short), N8, f8);
+
+ }
+
+ fclose(f16);
+ fclose(f8);
+ return 0;
+
+}
+++ /dev/null
-/*
- t16__short_8.c
- David Rowe
- 19 August 2014
-
- Unit test for 16 to 8 kHz sample rate conversion functions. I
- evaluated output by plotting using Octave and looking for jaggies:
-
- pl("../unittest/out16_short.raw",1,3000)
- pl("../unittest/out8.raw",1,3000)
-
- Listening to it also shows up anything nasty:
-
- $ play -s -2 -r 16000 out16_short.raw
- $ play -s -2 -r 8000 out8.raw
-
- */
-
-#include <assert.h>
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "codec2_fdmdv.h"
-
-#define N8 160 /* procssing buffer size at 8 kHz */
-#define N16 (N8*FDMDV_OS)
-#define FRAMES 100
-#define TWO_PI 6.283185307
-#define FS 16000
-
-#define SINE
-
-int main() {
- float in8k[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];
- FILE *f8;
-
- int i,f,t,t1;
- float freq = 800.0;
-
- f16 = fopen("out16_short.raw", "wb");
- assert(f16 != NULL);
- f8 = fopen("out8.raw", "wb");
- assert(f8 != NULL);
-
- /* clear filter memories */
-
- for(i=0; i<FDMDV_OS_TAPS_8K; i++)
- in8k[i] = 0.0;
- for(i=0; i<FDMDV_OS_TAPS_16K; i++)
- in16k_short[i] = 0;
-
- t = t1 = 0;
- for(f=0; f<FRAMES; f++) {
-
-#ifdef DC
- for(i=0; i<N8; i++)
- in8k[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);
-#endif
-
- /* upsample */
-
- fdmdv_8_to_16_short(out16k_short, &in8k[FDMDV_OS_TAPS_8K], N8);
-
- fwrite(out16k_short, sizeof(short), N16, f16);
-
- /* add a 6 kHz spurious signal for fun, we want down sampler to
- knock this out */
-
- for(i=0; i<N16; i++,t1++)
- in16k_short[i+FDMDV_OS_TAPS_16K] = out16k_short[i] + 8000.0*cos(TWO_PI*t1*6000.0/FS);
-
- /* downsample */
-
- fdmdv_16_short_to_8(out8k, &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);
-
- }
-
- fclose(f16);
- fclose(f8);
- return 0;
-
-}
projects / freetel-svn-tracking.git / commitdiff