48 to 8k unit test checks out OK

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

diff --git a/codec2-dev/README_fdmdv.txt b/codec2-dev/README_fdmdv.txt
index 301d6ad2dc88cdbe91d04b71fbbf5a1dcb14c3d0..8f121d5a2ef9885a506b7350b7f6981455d53e19 100644 (file)
--- a/codec2-dev/README_fdmdv.txt
+++ b/codec2-dev/README_fdmdv.txt
@@ -166,6 +166,8 @@ TODO
 ----
 
 [ ] 48 kHz to and from 8 kHz routines to drive 48 kHz sound card audio
+[ ] implement SNR and ppm measurements in fdmdv_get_demod_stats()
+[ ] implement fdmdv_get_waterfall_line()
 [ ] try interfering sine wave
     + maybe swept
     + does modem fall over?
@@ -182,5 +184,4 @@ TODO
     + e.g. hang on thru the fades?
 [ ] PAPR idea
     + automatically tweak phases to reduce PAPR, e.g. slow variations in freq...
-[ ] implement SNR and ppm measurements
 

diff --git a/codec2-dev/src/fdmdv.c b/codec2-dev/src/fdmdv.c
index c17ab48358f160ac28f9e554aa7c12eb34d4def2..2f7ab3c84a2f5300bb63fcbc6f91d2a375f789f4 100644 (file)
--- a/codec2-dev/src/fdmdv.c
+++ b/codec2-dev/src/fdmdv.c
@@ -1204,6 +1204,7 @@ void fdmdv_8_to_48(float out48k[], float in8k[], int n)
            out48k[i*FDMDV_OS+j] = 0.0;
            for(k=0,l=0; k<FDMDV_OS_TAPS; k+=FDMDV_OS,l++)
                out48k[i*FDMDV_OS+j] += fdmdv_os_filter[k+j]*in8k[i-l];
+           out48k[i*FDMDV_OS+j] *= FDMDV_OS;
            
        }
     }  

diff --git a/codec2-dev/src/fdmdv.h b/codec2-dev/src/fdmdv.h
index a37c0da13678d792124e9786ebf25d362d2a49dc..4c31855fa957b3e5318139a08d2076656b067ba9 100644 (file)
--- a/codec2-dev/src/fdmdv.h
+++ b/codec2-dev/src/fdmdv.h
@@ -48,6 +48,13 @@ extern "C" {
 #define FDMDV_SCALE                 1000  /* suggested scaling for 16 bit shorts                            */
 #define FDMDV_NSYM                    15
 
+/* 8 to 48 kHz sample rate conversion */
+
+#define FDMDV_OS                 6         /* oversampling rate           */
+#define FDMDV_OS_TAPS           48         /* number of OS filter taps    */
+
+/* FDMDV states and stats structures */
+
 struct FDMDV;
     
 struct FDMDV_STATS {

diff --git a/codec2-dev/src/fdmdv_internal.h b/codec2-dev/src/fdmdv_internal.h
index 6b63a32a0823bb9807b3b2b83d78581d8a08d7d9..435244fd9f29210edd0514b9d5ed8283f4a4f60c 100644 (file)
--- a/codec2-dev/src/fdmdv_internal.h
+++ b/codec2-dev/src/fdmdv_internal.h
@@ -69,11 +69,6 @@
 #define FINE                     1
 #define TRACK_COEFF              0.5
 
-/* 8 to 48 kHz sample rate conversion */
-
-#define FDMDV_OS                 6         /* oversampling rate           */
-#define FDMDV_OS_TAPS           48         /* number of OS filter taps    */
-
 /*---------------------------------------------------------------------------*\
                                                                              
                                STRUCT for States

diff --git a/codec2-dev/unittest/Makefile.am b/codec2-dev/unittest/Makefile.am
index 96b930e9be0dc5d3014f587278a90d7a90e2f9df..6f2d3465adc90845c9089e3ec4a234dc15aad2ea 100644 (file)
--- a/codec2-dev/unittest/Makefile.am
+++ b/codec2-dev/unittest/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTS = gnu
 NAME = libcodec2
 AM_CPPFLAGS = $(AM_CFLAGS)
 
-noinst_PROGRAMS = genres genlsp extract vqtrain vqtrainjnd tnlp tinterp tquant tcodec2 vq_train_jvm scalarlsptest tfdmdv
+noinst_PROGRAMS = genres genlsp extract vqtrain vqtrainjnd tnlp tinterp tquant tcodec2 vq_train_jvm scalarlsptest tfdmdv t48_8
 
 genres_SOURCES = genres.c ../src/lpc.c
 genres_LDADD = $(lib_LTLIBRARIES) 
@@ -56,3 +56,6 @@ tfdmdv_SOURCES = tfdmdv.c ../src/fdmdv.c ../src/fft.c ../src/kiss_fft.c ../src/o
 tfdmdv_LDADD = $(lib_LTLIBRARIES) 
 tfdmdv_LDFLAGS = $(LIBS)
 
+t48_8_SOURCES = t48_8.c ../src/fdmdv.c ../src/fft.c ../src/kiss_fft.c
+t48_8_LDADD = $(lib_LTLIBRARIES) 
+t48_8_LDFLAGS = $(LIBS)

diff --git a/codec2-dev/unittest/Makefile.in b/codec2-dev/unittest/Makefile.in
index 00af6dcbab89b97e56104b4c4054a5242214860e..b378ad63c67562171dfe48e0ac3ffdfb734b196a 100644 (file)
--- a/codec2-dev/unittest/Makefile.in
+++ b/codec2-dev/unittest/Makefile.in
@@ -39,7 +39,8 @@ host_triplet = @host@
 noinst_PROGRAMS = genres$(EXEEXT) genlsp$(EXEEXT) extract$(EXEEXT) \
        vqtrain$(EXEEXT) vqtrainjnd$(EXEEXT) tnlp$(EXEEXT) \
        tinterp$(EXEEXT) tquant$(EXEEXT) tcodec2$(EXEEXT) \
-       vq_train_jvm$(EXEEXT) scalarlsptest$(EXEEXT) tfdmdv$(EXEEXT)
+       vq_train_jvm$(EXEEXT) scalarlsptest$(EXEEXT) tfdmdv$(EXEEXT) \
+       t48_8$(EXEEXT)
 subdir = unittest
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -67,6 +68,10 @@ am_scalarlsptest_OBJECTS = scalarlsptest.$(OBJEXT) quantise.$(OBJEXT) \
        kiss_fft.$(OBJEXT) $(am__objects_1)
 scalarlsptest_OBJECTS = $(am_scalarlsptest_OBJECTS)
 scalarlsptest_DEPENDENCIES =
+am_t48_8_OBJECTS = t48_8.$(OBJEXT) fdmdv.$(OBJEXT) fft.$(OBJEXT) \
+       kiss_fft.$(OBJEXT)
+t48_8_OBJECTS = $(am_t48_8_OBJECTS)
+t48_8_DEPENDENCIES =
 am_tcodec2_OBJECTS = tcodec2.$(OBJEXT) quantise.$(OBJEXT) \
        lpc.$(OBJEXT) lsp.$(OBJEXT) dump.$(OBJEXT) fft.$(OBJEXT) \
        kiss_fft.$(OBJEXT) codec2.$(OBJEXT) sine.$(OBJEXT) \
@@ -114,14 +119,14 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(extract_SOURCES) $(genlsp_SOURCES) $(genres_SOURCES) \
-       $(scalarlsptest_SOURCES) $(tcodec2_SOURCES) $(tfdmdv_SOURCES) \
-       $(tinterp_SOURCES) $(tnlp_SOURCES) $(tquant_SOURCES) \
-       $(vq_train_jvm_SOURCES) $(vqtrain_SOURCES) \
+       $(scalarlsptest_SOURCES) $(t48_8_SOURCES) $(tcodec2_SOURCES) \
+       $(tfdmdv_SOURCES) $(tinterp_SOURCES) $(tnlp_SOURCES) \
+       $(tquant_SOURCES) $(vq_train_jvm_SOURCES) $(vqtrain_SOURCES) \
        $(vqtrainjnd_SOURCES)
 DIST_SOURCES = $(extract_SOURCES) $(genlsp_SOURCES) $(genres_SOURCES) \
-       $(scalarlsptest_SOURCES) $(tcodec2_SOURCES) $(tfdmdv_SOURCES) \
-       $(tinterp_SOURCES) $(tnlp_SOURCES) $(tquant_SOURCES) \
-       $(vq_train_jvm_SOURCES) $(vqtrain_SOURCES) \
+       $(scalarlsptest_SOURCES) $(t48_8_SOURCES) $(tcodec2_SOURCES) \
+       $(tfdmdv_SOURCES) $(tinterp_SOURCES) $(tnlp_SOURCES) \
+       $(tquant_SOURCES) $(vq_train_jvm_SOURCES) $(vqtrain_SOURCES) \
        $(vqtrainjnd_SOURCES)
 ETAGS = etags
 CTAGS = ctags
@@ -273,6 +278,9 @@ scalarlsptest_LDFLAGS = $(LIBS)
 tfdmdv_SOURCES = tfdmdv.c ../src/fdmdv.c ../src/fft.c ../src/kiss_fft.c ../src/octave.c
 tfdmdv_LDADD = $(lib_LTLIBRARIES) 
 tfdmdv_LDFLAGS = $(LIBS)
+t48_8_SOURCES = t48_8.c ../src/fdmdv.c ../src/fft.c ../src/kiss_fft.c
+t48_8_LDADD = $(lib_LTLIBRARIES) 
+t48_8_LDFLAGS = $(LIBS)
 all: all-am
 
 .SUFFIXES:
@@ -325,6 +333,9 @@ genres$(EXEEXT): $(genres_OBJECTS) $(genres_DEPENDENCIES)
 scalarlsptest$(EXEEXT): $(scalarlsptest_OBJECTS) $(scalarlsptest_DEPENDENCIES) 
        @rm -f scalarlsptest$(EXEEXT)
        $(LINK) $(scalarlsptest_LDFLAGS) $(scalarlsptest_OBJECTS) $(scalarlsptest_LDADD) $(LIBS)
+t48_8$(EXEEXT): $(t48_8_OBJECTS) $(t48_8_DEPENDENCIES) 
+       @rm -f t48_8$(EXEEXT)
+       $(LINK) $(t48_8_LDFLAGS) $(t48_8_OBJECTS) $(t48_8_LDADD) $(LIBS)
 tcodec2$(EXEEXT): $(tcodec2_OBJECTS) $(tcodec2_DEPENDENCIES) 
        @rm -f tcodec2$(EXEEXT)
        $(LINK) $(tcodec2_LDFLAGS) $(tcodec2_OBJECTS) $(tcodec2_LDADD) $(LIBS)
@@ -382,6 +393,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantise.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarlsptest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t48_8.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcodec2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfdmdv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinterp.Po@am__quote@
@@ -594,6 +606,20 @@ codebookge.obj: ../src/codebookge.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o codebookge.obj `if test -f '../src/codebookge.c'; then $(CYGPATH_W) '../src/codebookge.c'; else $(CYGPATH_W) '$(srcdir)/../src/codebookge.c'; fi`
 
+fdmdv.o: ../src/fdmdv.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fdmdv.o -MD -MP -MF "$(DEPDIR)/fdmdv.Tpo" -c -o fdmdv.o `test -f '../src/fdmdv.c' || echo '$(srcdir)/'`../src/fdmdv.c; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/fdmdv.Tpo" "$(DEPDIR)/fdmdv.Po"; else rm -f "$(DEPDIR)/fdmdv.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../src/fdmdv.c' object='fdmdv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fdmdv.o `test -f '../src/fdmdv.c' || echo '$(srcdir)/'`../src/fdmdv.c
+
+fdmdv.obj: ../src/fdmdv.c
+@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fdmdv.obj -MD -MP -MF "$(DEPDIR)/fdmdv.Tpo" -c -o fdmdv.obj `if test -f '../src/fdmdv.c'; then $(CYGPATH_W) '../src/fdmdv.c'; else $(CYGPATH_W) '$(srcdir)/../src/fdmdv.c'; fi`; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/fdmdv.Tpo" "$(DEPDIR)/fdmdv.Po"; else rm -f "$(DEPDIR)/fdmdv.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../src/fdmdv.c' object='fdmdv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fdmdv.obj `if test -f '../src/fdmdv.c'; then $(CYGPATH_W) '../src/fdmdv.c'; else $(CYGPATH_W) '$(srcdir)/../src/fdmdv.c'; fi`
+
 codec2.o: ../src/codec2.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT codec2.o -MD -MP -MF "$(DEPDIR)/codec2.Tpo" -c -o codec2.o `test -f '../src/codec2.c' || echo '$(srcdir)/'`../src/codec2.c; \
 @am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/codec2.Tpo" "$(DEPDIR)/codec2.Po"; else rm -f "$(DEPDIR)/codec2.Tpo"; exit 1; fi
@@ -692,20 +718,6 @@ pack.obj: ../src/pack.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pack.obj `if test -f '../src/pack.c'; then $(CYGPATH_W) '../src/pack.c'; else $(CYGPATH_W) '$(srcdir)/../src/pack.c'; fi`
 
-fdmdv.o: ../src/fdmdv.c
-@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fdmdv.o -MD -MP -MF "$(DEPDIR)/fdmdv.Tpo" -c -o fdmdv.o `test -f '../src/fdmdv.c' || echo '$(srcdir)/'`../src/fdmdv.c; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/fdmdv.Tpo" "$(DEPDIR)/fdmdv.Po"; else rm -f "$(DEPDIR)/fdmdv.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../src/fdmdv.c' object='fdmdv.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fdmdv.o `test -f '../src/fdmdv.c' || echo '$(srcdir)/'`../src/fdmdv.c
-
-fdmdv.obj: ../src/fdmdv.c
-@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fdmdv.obj -MD -MP -MF "$(DEPDIR)/fdmdv.Tpo" -c -o fdmdv.obj `if test -f '../src/fdmdv.c'; then $(CYGPATH_W) '../src/fdmdv.c'; else $(CYGPATH_W) '$(srcdir)/../src/fdmdv.c'; fi`; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/fdmdv.Tpo" "$(DEPDIR)/fdmdv.Po"; else rm -f "$(DEPDIR)/fdmdv.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../src/fdmdv.c' object='fdmdv.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fdmdv.obj `if test -f '../src/fdmdv.c'; then $(CYGPATH_W) '../src/fdmdv.c'; else $(CYGPATH_W) '$(srcdir)/../src/fdmdv.c'; fi`
-
 octave.o: ../src/octave.c
 @am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT octave.o -MD -MP -MF "$(DEPDIR)/octave.Tpo" -c -o octave.o `test -f '../src/octave.c' || echo '$(srcdir)/'`../src/octave.c; \
 @am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/octave.Tpo" "$(DEPDIR)/octave.Po"; else rm -f "$(DEPDIR)/octave.Tpo"; exit 1; fi

diff --git a/codec2-dev/unittest/t48_8.c b/codec2-dev/unittest/t48_8.c
new file mode 100644 (file)
index 0000000..236bb78
--- /dev/null
+++ b/codec2-dev/unittest/t48_8.c
@@ -0,0 +1,87 @@
+/* Unit test for 48 to 8 kHz sample rate conversion functions */
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "fdmdv.h"
+
+#define N8                        160 /* procssing buffer size at 8 kHz */
+#define N48             (N8*FDMDV_OS)
+#define MEM8 (FDMDV_OS_TAPS/FDMDV_OS)
+#define FRAMES                     50
+#define TWO_PI            6.283185307
+#define FS                       8000
+
+#define SINE
+
+int main() {
+    float in8k[MEM8 + N8];
+    float out48k[N48];
+    short out48k_short[N48];
+    FILE *f48;
+
+    float in48k[FDMDV_OS_TAPS + N48];
+    float out8k[N48];
+    short out8k_short[N8];
+    FILE *f8;
+
+    int i,f,t;
+    float freq = 505.0;
+
+    f48 = fopen("out48.raw", "wb");
+    assert(f48 != NULL);
+    f8 = fopen("out8.raw", "wb");
+    assert(f8 != NULL);
+    
+    /* clear filter memories */
+
+    for(i=0; i<MEM8; i++)
+       in8k[i] = 0.0;
+    for(i=0; i<FDMDV_OS_TAPS; i++)
+       in48k[i] = 0.0;
+
+    t = 0;
+    for(f=0; f<FRAMES; f++) {
+
+#ifdef DC
+       for(i=0; i<N8; i++)
+           in8k[MEM8+i] = 16000.0;
+#endif
+#ifdef SINE
+       for(i=0; i<N8; i++,t++)
+           in8k[MEM8+i] = 16000.0*cos(TWO_PI*t*freq/FS);
+#endif
+
+       /* upsample and update filter memory */
+
+       fdmdv_8_to_48(out48k, &in8k[MEM8], N8);
+       for(i=0; i<MEM8; i++)
+           in8k[i] = in8k[i+N8];
+
+       /* save 48k to disk for plotting and check out */
+
+       for(i=0; i<N48; i++)
+           out48k_short[i] = (short)out48k[i];
+       fwrite(out48k_short, sizeof(short), N48, f48);
+       
+       /* downsample and update filter memory */
+
+       for(i=0; i<N48; i++)
+           in48k[i+FDMDV_OS_TAPS] = out48k[i];
+       fdmdv_48_to_8(out8k, &in48k[FDMDV_OS_TAPS], N8);
+       for(i=0; i<FDMDV_OS_TAPS; i++)
+           in48k[i] = in48k[i+N48];
+
+       /* 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(f48);
+    fclose(f8);
+    return 0;
+
+}