From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 25 Oct 2012 01:25:25 +0000 (+0000)
Subject: fifo support
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=e4d69fd5cd5dd71cee3138f89ba882d12032bf33;p=freetel-svn-tracking.git

fifo support

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

diff --git a/codec2-dev/src/Makefile.in b/codec2-dev/src/Makefile.in
index 73dcd428..f59392a7 100644
--- a/codec2-dev/src/Makefile.in
+++ b/codec2-dev/src/Makefile.in
@@ -66,14 +66,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-fdmdv.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-codebookvqanssi.lo libcodec2_la-codebookdt.lo \
-	libcodec2_la-codebookge.lo
+	libcodec2_la-fifo.lo libcodec2_la-fdmdv.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-codebookvqanssi.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)
@@ -315,7 +315,8 @@ CODEBOOKSJVM = \
 CODEBOOKSVQANSSI = \
   $D/lspvqanssi1.txt \
   $D/lspvqanssi2.txt \
-  $D/lspvqanssi3.txt
+  $D/lspvqanssi3.txt \
+  $D/lspvqanssi4.txt
 
 CODEBOOKSGE = \
   $D/gecb.txt 
@@ -327,6 +328,7 @@ nlp.c \
 postfilter.c \
 sine.c \
 codec2.c \
+fifo.c \
 fdmdv.c \
 kiss_fft.c \
 interp.c \
@@ -531,6 +533,7 @@ distclean-compile:
 @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-fifo.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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcodec2_la-lpc.Plo@am__quote@
@@ -607,6 +610,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-fifo.lo: fifo.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-fifo.lo -MD -MP -MF "$(DEPDIR)/libcodec2_la-fifo.Tpo" -c -o libcodec2_la-fifo.lo `test -f 'fifo.c' || echo '$(srcdir)/'`fifo.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcodec2_la-fifo.Tpo" "$(DEPDIR)/libcodec2_la-fifo.Plo"; else rm -f "$(DEPDIR)/libcodec2_la-fifo.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fifo.c' object='libcodec2_la-fifo.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-fifo.lo `test -f 'fifo.c' || echo '$(srcdir)/'`fifo.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
@@ -944,7 +954,7 @@ codebookjnd.c: generate_codebook $(CODEBOOKSJND)
 codebookjvm.c: generate_codebook $(CODEBOOKSJVM)
 	./generate_codebook lsp_cbjvm $(CODEBOOKSJVM) > codebookjvm.c
 
-codebookvqanssi.c: generate_codebook $(CODEBOOKSVQEXP)
+codebookvqanssi.c: generate_codebook $(CODEBOOKSVQANSSI)
 	./generate_codebook lsp_cbvqanssi $(CODEBOOKSVQANSSI) > codebookvqanssi.c
 
 codebookge.c: generate_codebook $(CODEBOOKSGE)