Bump to codec2 version 1.2.0erdgeist-bump-to-1.2.0

1 files changed, 9 insertions, 8 deletions

diff --git a/stripdown.sh b/stripdown.sh
index c8d8332..c91694a 100755
--- a/stripdown.sh
+++ b/stripdown.sh
@@ -3,10 +3,10 @@
 BUILDDIR=build_stripped
 DESTDIR=codec2lite
 
-LIBSRC="codebook.c codebookd.c codebookge.c codebookjvm.c codebooknewamp1.c codebooknewamp1_energy.c codec2.c codec2_fft.c interp.c kiss_fft.c kiss_fftr.c lpc.c lsp.c mbest.c newamp1.c newamp2.c nlp.c pack.c phase.c postfilter.c quantise.c sine.c"
-LIBGENSRC="codebooklspmelvq.c codebookmel.c codebooknewamp2.c codebooknewamp2_energy.c"
+LIBSRC="codec2.c codec2_fft.c interp.c kiss_fft.c kiss_fftr.c lpc.c lsp.c mbest.c newamp1.c nlp.c pack.c phase.c postfilter.c quantise.c sine.c"
+LIBGENSRC="codebook.c codebookd.c codebookge.c codebooknewamp1.c codebooknewamp1_energy.c codebooknewamp2.c codebooknewamp2_energy.c codebookjmv.c"
 
-LIBINC="_kiss_fft_guts.h comp_prim.h lpc.h os.h bpf.h lsp.h phase.h bpfb.h defines.h machdep.h postfilter.h mbest.h quantise.h codec2_fft.h interp.h newamp1.h sine.h codec2_internal.h kiss_fft.h newamp2.h comp.h kiss_fftr.h nlp.h"
+LIBINC="_kiss_fft_guts.h comp_prim.h lpc.h os.h bpf.h lsp.h phase.h bpfb.h defines.h machdep.h postfilter.h mbest.h quantise.h codec2_fft.h interp.h newamp1.h sine.h codec2_internal.h kiss_fft.h comp.h kiss_fftr.h nlp.h"
 LIBGENINC="version.h"
 
 EMPTYINC="c2wideband.h dump.h"
@@ -36,7 +36,7 @@ done
 
 cd ${BUILDDIR}
 cmake ..
-make tnewamp1
+cmake --build . -t codec2
 
 # copy generated files
 for file in ${LIBGENSRC}; do
@@ -55,10 +55,9 @@ CFLAGS =  -Wall -Wno-strict-overflow -std=gnu11 -fPIC -g -O2 -I. -lm
 CFLAGS += -DHORUS_L2_RX -DINTERLEAVER -DRUN_TIME_TABLES -DSCRAMBLER -Dcodec2_EXPORTS
 CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers
 
-LIBSRC=codebook.c codebookd.c codebookge.c codebookmel.c codebooklspmelvq.c codebookjvm.c \
-        codebooknewamp1.c codebooknewamp1_energy.c codebooknewamp2.c codebooknewamp2_energy.c \
-        codec2.c codec2_fft.c interp.c kiss_fft.c kiss_fftr.c lpc.c lsp.c mbest.c \
-        newamp1.c newamp2.c nlp.c pack.c phase.c postfilter.c quantise.c sine.c
+LIBSRC=codebook.c codebookd.c codebookge.c codebookjmv.c codebooknewamp1_energy.c \
+        codebooknewamp1.c codec2.c codec2_fft.c interp.c kiss_fft.c kiss_fftr.c \
+        lpc.c lsp.c mbest.c newamp1.c nlp.c pack.c phase.c postfilter.c quantise.c sine.c
 
 all: main
 
@@ -87,6 +86,8 @@ int main() {
     int off = 0;
     unsigned char bits[128];
 
+    fprintf(stderr, "%d samples per frame, %d bits per frame\n", nsam, nbit);
+
     fread(input, 976692, 1, f);
     fclose(f);