cleaned up a little

Author: drowe67

src/CMakeLists.txt

@@ -48,10 +48,6 @@ set(CODEBOOKSNEWAMP1
     ${D}/train_120_2.txt
 )
 
-set(CODEBOOKSNEWAMP1_SQ
-    ${D}/train_120_1_sq.txt
-    ${D}/train_120_2_sq.txt
-)
 set(CODEBOOKSNEWAMP1_ENERGY
     ${D}/newamp1_energy_q.txt
 )
@@ -127,13 +123,6 @@ add_custom_command(
     DEPENDS generate_codebook ${CODEBOOKSNEWAMP1}
 )
 
-# codebooknewamp1_sq.c
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1_sq.c
-    COMMAND generate_codebook newamp1vq_cbsq ${CODEBOOKSNEWAMP1_SQ} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1_sq.c
-    DEPENDS generate_codebook ${CODEBOOKSNEWAMP1_SQ}
-)
-
 # codebooknewamp1_energy.c
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1_energy.c
@@ -191,7 +180,6 @@ set(CODEC2_SRCS
     codebookjvm.c
     codebookge.c
     codebooknewamp1.c
-    codebooknewamp1_sq.c
     codebooknewamp1_energy.c
     codebooknewamp2.c
     codebooknewamp2_energy.c

src/defines.h

@@ -104,7 +104,7 @@ struct lsp_codebook {
 extern const struct lsp_codebook lsp_cb[];
 extern const struct lsp_codebook lsp_cbd[];
 extern const struct lsp_codebook lsp_cbjvm[];
-extern const struct lsp_codebook lspmelvq_cb[];
+extern const struct lsp_codebook ge_cb[];
 extern const struct lsp_codebook newamp1vq_cb[];
 extern const struct lsp_codebook newamp1_energy_cb[];
 extern const struct lsp_codebook newamp2vq_cb[];

unittest/tvq_mbest.c

@@ -17,7 +17,8 @@ void write_float_file(char fn[], float *values, int n) {
 }
 
 int main(void) {
-    float target[] = {1.0,1,0}; write_float_file("target.f32", target, 2);
+    float target[] = {1.0,1.0};
+    write_float_file("target.f32", target, 2);
     float vq1[] = {0.9,0.9,  /* this will be a better match on first stage */
 		   0.8,0.8}; /* but after second stage should choose this  */
     write_float_file("vq1.f32", vq1, 4);