fix building bugs pointedout by Andreas

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

diff --git a/codec2/src/code.sh b/codec2/src/code.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/codec2/unittest/Makefile b/codec2/unittest/Makefile
index 23d7039d0c36a6842a3e29db97d6fc675714f576..e0a3472105223e1b16ce7d8f7722cb0785b6964d 100644 (file)
--- a/codec2/unittest/Makefile
+++ b/codec2/unittest/Makefile
@@ -1,13 +1,11 @@
 CFLAGS = -I. -I../src -I../speex -Wall -g -DFLOATING_POINT -DVAR_ARRAYS
 
-all: genres lsptest genlsp extract vqtrain tnlp tcontphase tmodel
+all: genres genlsp extract vqtrain tnlp
 
 genres: genres.o ../src/lpc.o
        gcc $(CFLAGS) -o genres genres.o ../src/lpc.o -lm
 
-LSP_TEST_OBJ = lsptest.o ../src/lpc.o ../speex/lsp.o sd.o ../src/four1.o \
-               ../speex/quant_lsp.o ../speex/bits.o ../speex/lsp_tables_nb.o \
-               ../speex/high_lsp_tables.c
+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
@@ -18,8 +16,8 @@ TCONTPHASE_OBJ = tcontphase.o ../src/globals.o ../src/dump.o ../src/synth.o \
 lsptest: $(LSP_TEST_OBJ)
        gcc $(CFLAGS) -o lsptest $(LSP_TEST_OBJ) -lm
 
-genlsp: genlsp.o ../src/lpc.o ../speex/lsp.o
-       gcc $(CFLAGS) -o genlsp genlsp.o ../src/lpc.o ../speex/lsp.o -lm
+genlsp: genlsp.o ../src/lpc.o ../src/lsp.o
+       gcc $(CFLAGS) -o genlsp genlsp.o ../src/lpc.o ../src/lsp.o -lm
 
 extract: extract.o
        gcc $(CFLAGS) -o extract extract.o -lm

diff --git a/codec2/unittest/genlsp.c b/codec2/unittest/genlsp.c
index ae626315835be2441124a35708211bcc5c525639..55283621b73ebc080932e7a453ff0c0107627532 100644 (file)
--- a/codec2/unittest/genlsp.c
+++ b/codec2/unittest/genlsp.c
@@ -122,7 +122,7 @@ int main(int argc, char *argv[]) {
            printf("Active Frame: %ld  unstables: %d\n",af, unstables);
 
            find_aks(Sn, ak, NW, P, &Eres);
-           roots = lpc_to_lsp(&ak[1], P , lsp, 5, LSP_DELTA1, NULL);
+           roots = lpc_to_lsp(&ak[1], P , lsp, 5, LSP_DELTA1);
            if (roots == P) {
                if (lspd) {
                    fprintf(flsp,"%f ",lsp[0]);

diff --git a/codec2/unittest/lsptest.c b/codec2/unittest/lsptest.c
index 81d23670d9d5a30f1085d85a8848b9d98379b75a..506772f5c89047727d45857b4984bd6e37cb2f9e 100644 (file)
--- a/codec2/unittest/lsptest.c
+++ b/codec2/unittest/lsptest.c
@@ -32,8 +32,6 @@
 #include <lpc.h>
 #include <lsp.h>
 #include <sd.h>
-#include <speex_bits.h>
-#include <quant_lsp.h>
 
 #define N 160
 #define P 10