added fdmdv.c to the codec2 library

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

diff --git a/codec2-dev/src/Makefile.am b/codec2-dev/src/Makefile.am
index c8b81b5165a1a2ad1572fed5b30c0b89aae358e6..428daee7e8f973c6bae2053815721e065cbc4c62 100644 (file)
--- a/codec2-dev/src/Makefile.am
+++ b/codec2-dev/src/Makefile.am
@@ -100,6 +100,7 @@ nlp.c \
 postfilter.c \
 sine.c \
 codec2.c \
+fdmdv.c \
 fft.c \
 kiss_fft.c \
 interp.c \

diff --git a/codec2-dev/src/Makefile.in b/codec2-dev/src/Makefile.in
index 621088cbd55cd082052f50d3f094ecc2dfaa4e7b..d4591e74c43b32ec214ea43ebe875423caff624a 100644 (file)
--- a/codec2-dev/src/Makefile.in
+++ b/codec2-dev/src/Makefile.in
@@ -65,13 +65,14 @@ libcodec2_la_LIBADD =
 am_libcodec2_la_OBJECTS = libcodec2_la-dump.lo libcodec2_la-lpc.lo \
        libcodec2_la-nlp.lo libcodec2_la-postfilter.lo \
        libcodec2_la-sine.lo libcodec2_la-codec2.lo \
-       libcodec2_la-fft.lo libcodec2_la-kiss_fft.lo \
-       libcodec2_la-interp.lo libcodec2_la-lsp.lo \
-       libcodec2_la-phase.lo libcodec2_la-quantise.lo \
-       libcodec2_la-pack.lo libcodec2_la-codebook.lo \
-       libcodec2_la-codebookd.lo libcodec2_la-codebookvq.lo \
-       libcodec2_la-codebookjnd.lo libcodec2_la-codebookjvm.lo \
-       libcodec2_la-codebookdt.lo libcodec2_la-codebookge.lo
+       libcodec2_la-fdmdv.lo libcodec2_la-fft.lo \
+       libcodec2_la-kiss_fft.lo libcodec2_la-interp.lo \
+       libcodec2_la-lsp.lo libcodec2_la-phase.lo \
+       libcodec2_la-quantise.lo libcodec2_la-pack.lo \
+       libcodec2_la-codebook.lo libcodec2_la-codebookd.lo \
+       libcodec2_la-codebookvq.lo libcodec2_la-codebookjnd.lo \
+       libcodec2_la-codebookjvm.lo libcodec2_la-codebookdt.lo \
+       libcodec2_la-codebookge.lo
 libcodec2_la_OBJECTS = $(am_libcodec2_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -302,6 +303,7 @@ nlp.c \
 postfilter.c \
 sine.c \
 codec2.c \
+fdmdv.c \
 fft.c \
 kiss_fft.c \
 interp.c \
@@ -497,6 +499,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcodec2_la-codebookvq.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcodec2_la-codec2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcodec2_la-dump.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcodec2_la-fdmdv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcodec2_la-fft.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcodec2_la-interp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcodec2_la-kiss_fft.Plo@am__quote@
@@ -573,6 +576,13 @@ libcodec2_la-codec2.lo: codec2.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcodec2_la_CFLAGS) $(CFLAGS) -c -o libcodec2_la-codec2.lo `test -f 'codec2.c' || echo '$(srcdir)/'`codec2.c
 
+libcodec2_la-fdmdv.lo: fdmdv.c
+@am__fastdepCC_TRUE@   if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcodec2_la_CFLAGS) $(CFLAGS) -MT libcodec2_la-fdmdv.lo -MD -MP -MF "$(DEPDIR)/libcodec2_la-fdmdv.Tpo" -c -o libcodec2_la-fdmdv.lo `test -f 'fdmdv.c' || echo '$(srcdir)/'`fdmdv.c; \
+@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/libcodec2_la-fdmdv.Tpo" "$(DEPDIR)/libcodec2_la-fdmdv.Plo"; else rm -f "$(DEPDIR)/libcodec2_la-fdmdv.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='fdmdv.c' object='libcodec2_la-fdmdv.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcodec2_la_CFLAGS) $(CFLAGS) -c -o libcodec2_la-fdmdv.lo `test -f 'fdmdv.c' || echo '$(srcdir)/'`fdmdv.c
+
 libcodec2_la-fft.lo: fft.c
 @am__fastdepCC_TRUE@   if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcodec2_la_CFLAGS) $(CFLAGS) -MT libcodec2_la-fft.lo -MD -MP -MF "$(DEPDIR)/libcodec2_la-fft.Tpo" -c -o libcodec2_la-fft.lo `test -f 'fft.c' || echo '$(srcdir)/'`fft.c; \
 @am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/libcodec2_la-fft.Tpo" "$(DEPDIR)/libcodec2_la-fft.Plo"; else rm -f "$(DEPDIR)/libcodec2_la-fft.Tpo"; exit 1; fi

diff --git a/codec2-dev/src/quantise.h b/codec2-dev/src/quantise.h
index 513e2c26e640beb57829f8ac1a58a92b8b4195da..b3206be7c8dd42da5517c3ed6089dcb5daeaa277 100644 (file)
--- a/codec2-dev/src/quantise.h
+++ b/codec2-dev/src/quantise.h
@@ -101,7 +101,7 @@ float speech_to_uq_lsps(float lsp[],
                        float w[],
                        int   order
                        );
-void check_lsp_order(float lsp[], int lpc_order);
+int check_lsp_order(float lsp[], int lpc_order);
 void bw_expand_lsps(float lsp[], int order);
 void locate_lsps_jnd_steps(float lsp[], int order);
 float decode_amplitudes(MODEL *model,