From a1bc68cb6de24caf56d3199db385e7f9bb545ea4 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Fri, 19 Nov 2010 22:21:36 +0000 Subject: [PATCH] vqtrain output vector k and m to text file to interface with generate_codebook git-svn-id: https://svn.code.sf.net/p/freetel/code@248 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2/unittest/Makefile.am | 8 ++++---- codec2/unittest/Makefile.in | 30 +++++++++++++++++++++++------- codec2/unittest/vqtrain.c | 3 ++- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/codec2/unittest/Makefile.am b/codec2/unittest/Makefile.am index 0db67d5c..a94fdf9d 100644 --- a/codec2/unittest/Makefile.am +++ b/codec2/unittest/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -I../src -fPIC -g -DFLOATING_POINT -DVAR_ARRAYS +AM_CFLAGS = -I../src -fPIC -g -DFLOATING_POINT -DVAR_ARRAYS -O2 AUTOMAKE_OPTS = gnu NAME = libcodec2 AM_CPPFLAGS = $(AM_CFLAGS) @@ -26,17 +26,17 @@ tnlp_SOURCES = tnlp.c ../src/sine.c ../src/nlp.c ../src/four1.c ../src/dump.c tnlp_LDADD = $(lib_LTLIBRARIES) tnlp_LDFLAGS = $(LIBS) -tinterp_SOURCES = tinterp.c ../src/sine.c ../src/four1.c ../src/interp.c ../src/lpc.c ../src/lsp.c ../src/quantise.c ../src/codebook.c ../src/codebookd.c ../src/dump.c +tinterp_SOURCES = tinterp.c ../src/sine.c ../src/four1.c ../src/interp.c ../src/lpc.c ../src/lsp.c ../src/quantise.c ../src/codebook.c ../src/codebookd.c ../src/codebookdvq.c ../src/dump.c tinterp_LDADD = $(lib_LTLIBRARIES) tinterp_LDFLAGS = $(LIBS) -tquant_SOURCES = tquant.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/four1.c ../src/codebook.c ../src/codebookd.c +tquant_SOURCES = tquant.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/four1.c ../src/codebook.c ../src/codebookd.c ../src/codebookdvq.c tquant_LDADD = $(lib_LTLIBRARIES) tquant_LDFLAGS = $(LIBS) tcodec2_SOURCES = tcodec2.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/four1.c \ ../src/codec2.c ../src/sine.c ../src/nlp.c ../src/postfilter.c ../src/phase.c ../src/interp.c \ -../src/codebook.c ../src/codebookd.c ../src/pack.c +../src/codebook.c ../src/codebookd.c ../src/codebookdvq.c ../src/pack.c tcodec2_LDADD = $(lib_LTLIBRARIES) tcodec2_LDFLAGS = $(LIBS) diff --git a/codec2/unittest/Makefile.in b/codec2/unittest/Makefile.in index d12b44c6..1a8d9ae9 100644 --- a/codec2/unittest/Makefile.in +++ b/codec2/unittest/Makefile.in @@ -63,13 +63,14 @@ am_tcodec2_OBJECTS = tcodec2.$(OBJEXT) quantise.$(OBJEXT) \ lpc.$(OBJEXT) lsp.$(OBJEXT) dump.$(OBJEXT) four1.$(OBJEXT) \ codec2.$(OBJEXT) sine.$(OBJEXT) nlp.$(OBJEXT) \ postfilter.$(OBJEXT) phase.$(OBJEXT) interp.$(OBJEXT) \ - codebook.$(OBJEXT) codebookd.$(OBJEXT) pack.$(OBJEXT) + codebook.$(OBJEXT) codebookd.$(OBJEXT) codebookdvq.$(OBJEXT) \ + pack.$(OBJEXT) tcodec2_OBJECTS = $(am_tcodec2_OBJECTS) tcodec2_DEPENDENCIES = am_tinterp_OBJECTS = tinterp.$(OBJEXT) sine.$(OBJEXT) four1.$(OBJEXT) \ interp.$(OBJEXT) lpc.$(OBJEXT) lsp.$(OBJEXT) \ quantise.$(OBJEXT) codebook.$(OBJEXT) codebookd.$(OBJEXT) \ - dump.$(OBJEXT) + codebookdvq.$(OBJEXT) dump.$(OBJEXT) tinterp_OBJECTS = $(am_tinterp_OBJECTS) tinterp_DEPENDENCIES = am_tnlp_OBJECTS = tnlp.$(OBJEXT) sine.$(OBJEXT) nlp.$(OBJEXT) \ @@ -78,7 +79,7 @@ tnlp_OBJECTS = $(am_tnlp_OBJECTS) tnlp_DEPENDENCIES = am_tquant_OBJECTS = tquant.$(OBJEXT) quantise.$(OBJEXT) lpc.$(OBJEXT) \ lsp.$(OBJEXT) dump.$(OBJEXT) four1.$(OBJEXT) \ - codebook.$(OBJEXT) codebookd.$(OBJEXT) + codebook.$(OBJEXT) codebookd.$(OBJEXT) codebookdvq.$(OBJEXT) tquant_OBJECTS = $(am_tquant_OBJECTS) tquant_DEPENDENCIES = am_vqtrain_OBJECTS = vqtrain.$(OBJEXT) @@ -208,7 +209,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CFLAGS = -I../src -fPIC -g -DFLOATING_POINT -DVAR_ARRAYS +AM_CFLAGS = -I../src -fPIC -g -DFLOATING_POINT -DVAR_ARRAYS -O2 AUTOMAKE_OPTS = gnu NAME = libcodec2 AM_CPPFLAGS = $(AM_CFLAGS) @@ -227,15 +228,15 @@ vqtrain_LDFLAGS = $(LIBS) tnlp_SOURCES = tnlp.c ../src/sine.c ../src/nlp.c ../src/four1.c ../src/dump.c tnlp_LDADD = $(lib_LTLIBRARIES) tnlp_LDFLAGS = $(LIBS) -tinterp_SOURCES = tinterp.c ../src/sine.c ../src/four1.c ../src/interp.c ../src/lpc.c ../src/lsp.c ../src/quantise.c ../src/codebook.c ../src/codebookd.c ../src/dump.c +tinterp_SOURCES = tinterp.c ../src/sine.c ../src/four1.c ../src/interp.c ../src/lpc.c ../src/lsp.c ../src/quantise.c ../src/codebook.c ../src/codebookd.c ../src/codebookdvq.c ../src/dump.c tinterp_LDADD = $(lib_LTLIBRARIES) tinterp_LDFLAGS = $(LIBS) -tquant_SOURCES = tquant.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/four1.c ../src/codebook.c ../src/codebookd.c +tquant_SOURCES = tquant.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/four1.c ../src/codebook.c ../src/codebookd.c ../src/codebookdvq.c tquant_LDADD = $(lib_LTLIBRARIES) tquant_LDFLAGS = $(LIBS) tcodec2_SOURCES = tcodec2.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/four1.c \ ../src/codec2.c ../src/sine.c ../src/nlp.c ../src/postfilter.c ../src/phase.c ../src/interp.c \ -../src/codebook.c ../src/codebookd.c ../src/pack.c +../src/codebook.c ../src/codebookd.c ../src/codebookdvq.c ../src/pack.c tcodec2_LDADD = $(lib_LTLIBRARIES) tcodec2_LDFLAGS = $(LIBS) @@ -333,6 +334,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/codebook.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/codebookd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/codebookdvq.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/codec2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract.Po@am__quote@ @@ -557,6 +559,20 @@ codebookd.obj: ../src/codebookd.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 codebookd.obj `if test -f '../src/codebookd.c'; then $(CYGPATH_W) '../src/codebookd.c'; else $(CYGPATH_W) '$(srcdir)/../src/codebookd.c'; fi` +codebookdvq.o: ../src/codebookdvq.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT codebookdvq.o -MD -MP -MF "$(DEPDIR)/codebookdvq.Tpo" -c -o codebookdvq.o `test -f '../src/codebookdvq.c' || echo '$(srcdir)/'`../src/codebookdvq.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/codebookdvq.Tpo" "$(DEPDIR)/codebookdvq.Po"; else rm -f "$(DEPDIR)/codebookdvq.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../src/codebookdvq.c' object='codebookdvq.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 codebookdvq.o `test -f '../src/codebookdvq.c' || echo '$(srcdir)/'`../src/codebookdvq.c + +codebookdvq.obj: ../src/codebookdvq.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT codebookdvq.obj -MD -MP -MF "$(DEPDIR)/codebookdvq.Tpo" -c -o codebookdvq.obj `if test -f '../src/codebookdvq.c'; then $(CYGPATH_W) '../src/codebookdvq.c'; else $(CYGPATH_W) '$(srcdir)/../src/codebookdvq.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/codebookdvq.Tpo" "$(DEPDIR)/codebookdvq.Po"; else rm -f "$(DEPDIR)/codebookdvq.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../src/codebookdvq.c' object='codebookdvq.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 codebookdvq.obj `if test -f '../src/codebookdvq.c'; then $(CYGPATH_W) '../src/codebookdvq.c'; else $(CYGPATH_W) '$(srcdir)/../src/codebookdvq.c'; fi` + pack.o: ../src/pack.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pack.o -MD -MP -MF "$(DEPDIR)/pack.Tpo" -c -o pack.o `test -f '../src/pack.c' || echo '$(srcdir)/'`../src/pack.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pack.Tpo" "$(DEPDIR)/pack.Po"; else rm -f "$(DEPDIR)/pack.Tpo"; exit 1; fi diff --git a/codec2/unittest/vqtrain.c b/codec2/unittest/vqtrain.c index d3f60d46..306249c8 100644 --- a/codec2/unittest/vqtrain.c +++ b/codec2/unittest/vqtrain.c @@ -44,7 +44,7 @@ \*-----------------------------------------------------------------------*/ -#define DELTAQ 0.01 /* quiting distortion */ +#define DELTAQ 0.001 /* quiting distortion */ #define MAX_STR 80 /* maximum string length */ /*-----------------------------------------------------------------------*\ @@ -170,6 +170,7 @@ int main(int argc, char *argv[]) { exit(1); } + fprintf(fvq,"%d %d\n",k,m); for(j=0; j