rm-ed 450 & 450WB

CMakeLists.txt

@@ -1146,14 +1146,6 @@ endif(NOT APPLE)
              COMMAND sh -c "./c2enc 700C ${CMAKE_CURRENT_SOURCE_DIR}/raw/hts1a.raw - | ./c2dec 700C - - | sox -t .s16 -r 8000 - hts1a_700C.wav"
              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src
              )
-     add_test(NAME test_codec2_mode_450
-             COMMAND sh -c "./c2enc 450 ${CMAKE_CURRENT_SOURCE_DIR}/raw/hts1a.raw - | ./c2dec 450 - - | sox -t .s16 -r 8000 - hts1a_450.wav"
-             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src
-             )
-     add_test(NAME test_codec2_mode_450PWB
-             COMMAND sh -c "./c2enc 450PWB ${CMAKE_CURRENT_SOURCE_DIR}/raw/hts1a.raw - | ./c2dec 450PWB - - | sox -t .s16 -r 16000 - hts1a_450PWB.wav"
-             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src
-             )
 
      add_test(NAME test_vq_mbest
              COMMAND sh -c "./tvq_mbest; \

src/CMakeLists.txt

@@ -169,7 +169,6 @@ set(CODEC2_SRCS
     lsp.c
     mbest.c
     newamp1.c
-    newamp2.c
     ofdm.c
     ofdm_mode.c
     phase.c

src/c2dec.c

@@ -139,14 +139,10 @@ int main(int argc, char *argv[]) {
       mode = CODEC2_MODE_1200;
     else if (strcmp(argv[1], "700C") == 0)
       mode = CODEC2_MODE_700C;
-    else if (strcmp(argv[1], "450") == 0)
-      mode = CODEC2_MODE_450;
-    else if (strcmp(argv[1], "450PWB") == 0)
-      mode = CODEC2_MODE_450PWB;
     else {
       fprintf(stderr,
               "Error in mode: %s.  Must be 3200, 2400, 1600, 1400, 1300, 1200, "
-              "700C, 450, or 450PWB\n",
+              "700C\n",
               argv[1]);
       exit(1);
     }
@@ -396,7 +392,7 @@ void print_help(const struct option *long_options, int num_opts, char *argv[]) {
   char *option_parameters;
   fprintf(stderr,
           "\nc2dec - Codec 2 decoder and bit error simulation program\n"
-          "usage: %s 3200|2400|1600|1400|1300|1200|700C|450|450PWB InputFile "
+          "usage: %s 3200|2400|1600|1400|1300|1200|700C InputFile "
           "OutputRawFile [OPTIONS]\n\n"
           "Options:\n",
           argv[0]);

src/c2enc.c

@@ -51,7 +51,7 @@ int main(int argc, char *argv[]) {
 
   if (argc < 4) {
     printf(
-        "usage: c2enc 3200|2400|1600|1400|1300|1200|700C|450|450PWB "
+        "usage: c2enc 3200|2400|1600|1400|1300|1200|700C "
         "InputRawspeechFile OutputBitFile [--natural] [--softdec] "
         "[--bitperchar] [--mlfeat f32File modelFile] [--loadcb stageNum "
         "Filename] [--var] [--eq]\n");
@@ -76,14 +76,10 @@ int main(int argc, char *argv[]) {
     mode = CODEC2_MODE_1200;
   else if (strcmp(argv[1], "700C") == 0)
     mode = CODEC2_MODE_700C;
-  else if (strcmp(argv[1], "450") == 0)
-    mode = CODEC2_MODE_450;
-  else if (strcmp(argv[1], "450PWB") == 0)
-    mode = CODEC2_MODE_450;
   else {
     fprintf(stderr,
             "Error in mode: %s.  Must be 3200, 2400, 1600, 1400, 1300, 1200, "
-            "700C, 450, 450PWB or WB\n",
+            "700C\n",
             argv[1]);
     exit(1);
   }