unittest files modified and tested for refactor

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

diff --git a/codec2/src/nlp.c b/codec2/src/nlp.c
index 11f7dfc59d26c40b5a64efa6fb12388f219e1c75..16bb319908b894171497176fae4ca3b7fbb7adcc 100644 (file)
--- a/codec2/src/nlp.c
+++ b/codec2/src/nlp.c
@@ -26,10 +26,11 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "nlp.h"
-#include "sine.h"
+#include "defines.h"
 #include "dump.h"
+#include "nlp.h"
 #include <assert.h>
+#include <math.h>
 
 /*---------------------------------------------------------------------------*\
                                                                              

diff --git a/codec2/unittest/Makefile b/codec2/unittest/Makefile
index e0a3472105223e1b16ce7d8f7722cb0785b6964d..9364eb00c85367829e2482ac3f4d8641da9e00d9 100644 (file)
--- a/codec2/unittest/Makefile
+++ b/codec2/unittest/Makefile
@@ -7,8 +7,7 @@ genres: genres.o ../src/lpc.o
 
 LSP_TEST_OBJ = lsptest.o ../src/lpc.o ../src/lsp.o sd.o ../src/four1.o
 
-TNLP_OBJ     = tnlp.o ../src/nlp.o ../src/four1.o ../src/initenc.o ../src/dump.o \
-               ../src/globals.o  ../src/refine.o
+TNLP_OBJ     = tnlp.o ../src/sine.o ../src/nlp.o ../src/four1.o ../src/dump.o
 
 TCONTPHASE_OBJ = tcontphase.o ../src/globals.o ../src/dump.o ../src/synth.o \
                  ../src/four1.c ../src/initdec.o ../src/phase.o
@@ -36,3 +35,6 @@ tmodel: tmodel.o
 
 %.o : %.c
        $(CC) -c $(CFLAGS) $< -o $@
+
+clean :
+       rm -f *.o *~ src/*~

diff --git a/codec2/unittest/tnlp.c b/codec2/unittest/tnlp.c
index 7254b763d97f179bb05c7b092d41ec8ade40e2a2..884ad3b6b0408617a9739924c0572aed7a05429a 100644 (file)
--- a/codec2/unittest/tnlp.c
+++ b/codec2/unittest/tnlp.c
@@ -36,8 +36,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include "nlp.h"
+
+#include "defines.h"
 #include "dump.h"
+#include "nlp.h"
 
 int   frames;
 
@@ -77,6 +79,10 @@ char *argv[];
 {
     FILE *fin,*fout;
     short buf[N];
+    float Sn[M];               /* float input speech samples */
+    COMP  Sw[FFT_ENC];         /* DFT of Sn[] */
+    float w[M];                        /* time domain hamming window */
+    COMP  W[FFT_ENC];          /* DFT of w[] */
     float pitch;
     int   i; 
     int   dump;
@@ -106,8 +112,7 @@ char *argv[];
     if (dump) 
       dump_on(argv[dump+1]);
 
-    init_encoder();
-    make_window(NW);
+    make_analysis_window(w,W);
 
     frames = 0;
     prev_Wo = 0;
@@ -120,7 +125,7 @@ char *argv[];
         Sn[i] = Sn[i+N];
       for(i=0; i<N; i++)
         Sn[i+M-N] = buf[i];
-      dft_speech();
+      dft_speech(Sw, Sn, w);
       dump_Sn(Sn); dump_Sw(Sw); 
 
       nlp(Sn,N,M,PITCH_MIN,PITCH_MAX,&pitch,Sw,&prev_Wo);