shithub: opus-tools

Info  •  Files  •  Log  •  Branches

Shorten container delay option.

--- a/man/opusenc.1

+++ b/man/opusenc.1

@@ -39,7 +39,7 @@

 ] [

 .B --downmix-stereo

 ] [

-.B --max-ogg-delay

+.B --max-delay

 .I ms

 ] [

 .B --save-range

@@ -119,7 +119,7 @@

 Downmix to mono

 .IP "--downmix-stereo"

 Downmix to stereo (if >2 channels input)

-.IP "--max-ogg-delay N"

+.IP "--max-delay N"

 Maximum container delay in milliseconds (0-1000, default: 1000)

 .IP "--save-range file"

 Saves check values for every frame to a file

@@ -175,7 +175,7 @@

 .SH NOTES

-While it is possible to use opusenc for low latency streaming (e.g. with --max-ogg-delay set to 0

+While it is possible to use opusenc for low latency streaming (e.g. with --max-delay set to 0

 and netcat instead of Icecast) it's not really designed for this, and the Ogg container

 and TCP transport aren't the best tools for that application. Shell

 pipelines themselves will often have high buffering. The ability to set

--- a/src/opusenc.c

+++ b/src/opusenc.c

@@ -132,7 +132,7 @@

   printf(" --expect-loss      Percentage packet loss to expect (default: 0)\n");

   printf(" --downmix-mono     Downmix to mono\n");

   printf(" --downmix-stereo   Downmix to stereo (if >2 channels)\n");

-  printf(" --max-ogg-delay n  Maximum container delay in milliseconds\n");

+  printf(" --max-delay n      Maximum container delay in milliseconds\n");

   printf("                      (0-1000, default: 1000)\n");

   printf("\nDiagnostic options:\n");

   printf(" --save-range file  Saves check values for every frame to a file\n");

@@ -183,7 +183,7 @@

     {"expect-loss", required_argument, NULL, 0},

     {"downmix-mono",no_argument,NULL, 0},

     {"downmix-stereo",no_argument,NULL, 0},

-    {"max-ogg-delay", required_argument, NULL, 0},

+    {"max-delay", required_argument, NULL, 0},

     {"save-range", required_argument, NULL, 0},

     {"set-ctl-int", required_argument, NULL, 0},

     {"uncoupled", no_argument, NULL, 0},

@@ -370,11 +370,11 @@

             fprintf(stderr,"Framesize must be 2.5, 5, 10, 20, 40, or 60.\n");

             exit(1);

           }

-        }else if(strcmp(long_options[option_index].name,"max-ogg-delay")==0){

+        }else if(strcmp(long_options[option_index].name,"max-delay")==0){

           max_ogg_delay=floor(atof(optarg)*48.);

           if(max_ogg_delay<0||max_ogg_delay>48000){

-            fprintf(stderr,"Invalid max-ogg-delay: %s\n",optarg);

-            fprintf(stderr,"max-ogg-delay 0-1000 ms.\n");

+            fprintf(stderr,"Invalid max-delay: %s\n",optarg);

+            fprintf(stderr,"max-delay 0-1000 ms.\n");

             exit(1);

           }

         }else if(strcmp(long_options[option_index].name,"set-ctl-int")==0){