shithub: opus

Download patch

ref: 0911f750e600195579e9d9be621d8914c4e18e51
parent: e623312fda7d203dcb7b03eacde30d32ade61596
author: Jean-Marc Valin <[email protected]>
date: Fri Feb 1 12:33:01 EST 2008 

bit of cleaning up, default sampling rate


--- a/tools/celtdec.c
+++ b/tools/celtdec.c
@@ -339,7 +339,7 @@
          fprintf (stderr, " (mono");
       else
          fprintf (stderr, " (stereo");
-      
+      fprintf(stderr, "\n");
    }
 
    *extra_headers = header.extra_headers;
@@ -369,13 +369,6 @@
       {"quiet", no_argument, NULL, 0},
       {"version", no_argument, NULL, 0},
       {"version-short", no_argument, NULL, 0},
-      {"enh", no_argument, NULL, 0},
-      {"no-enh", no_argument, NULL, 0},
-      {"pf", no_argument, NULL, 0},
-      {"no-pf", no_argument, NULL, 0},
-      {"force-nb", no_argument, NULL, 0},
-      {"force-wb", no_argument, NULL, 0},
-      {"force-uwb", no_argument, NULL, 0},
       {"rate", required_argument, NULL, 0},
       {"mono", no_argument, NULL, 0},
       {"stereo", no_argument, NULL, 0},
@@ -429,29 +422,6 @@
          {
             version_short();
             exit(0);
-         } else if (strcmp(long_options[option_index].name,"enh")==0)
-         {
-            enh_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"no-enh")==0)
-         {
-            enh_enabled=0;
-         } else if (strcmp(long_options[option_index].name,"pf")==0)
-         {
-            fprintf (stderr, "--pf is deprecated, use --enh instead\n");
-            enh_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"no-pf")==0)
-         {
-            fprintf (stderr, "--no-pf is deprecated, use --no-enh instead\n");
-            enh_enabled=0;
-         } else if (strcmp(long_options[option_index].name,"force-nb")==0)
-         {
-            forceMode=0;
-         } else if (strcmp(long_options[option_index].name,"force-wb")==0)
-         {
-            forceMode=1;
-         } else if (strcmp(long_options[option_index].name,"force-uwb")==0)
-         {
-            forceMode=2;
          } else if (strcmp(long_options[option_index].name,"mono")==0)
          {
             channels=1;
@@ -567,7 +537,6 @@
          while (!eos && ogg_stream_packetout(&os, &op) == 1)
          {
 	    if (!memcmp(op.packet, "CELT    ", 8)) {
-          fprintf (stderr, "Found it!\n");
 	       celt_serialno = os.serialno;
 	    }
 	    if (celt_serialno == -1 || os.serialno != celt_serialno)
@@ -610,7 +579,6 @@
                   else
                      ret = celt_decode(st, NULL, 0, output);
 
-                  fprintf (stderr, "dec %d %d\n", frame_size, channels);
                   /*for (i=0;i<frame_size*channels;i++)
                     printf ("%d\n", (int)output[i]);*/
 
--- a/tools/celtenc.c
+++ b/tools/celtenc.c
@@ -269,7 +269,7 @@
       {0, 0, 0, 0}
    };
    int print_bitrate=0;
-   celt_int32_t rate=0;
+   celt_int32_t rate=44100;
    celt_int32_t size;
    int chan=1;
    int fmt=16;
@@ -490,7 +490,6 @@
       int packet_size = celt_header_to_packet(&header, header_data, 100);
       op.packet = header_data;
       op.bytes = packet_size;
-      fprintf(stderr, "header size is %d\n", (int)op.bytes);
       op.b_o_s = 1;
       op.e_o_s = 0;
       op.granulepos = 0;