add --fast and --best flags

diff --git a/doc/documentation.html b/doc/documentation.html
index 4698756..4d6a3fb 100644 (file)
--- a/doc/documentation.html
+++ b/doc/documentation.html
@@ -217,7 +217,7 @@
                <B><TT>flac</TT></B> assumes that files ending in ".wav" or that have the RIFF WAVE header present are WAVE files; this may be overridden with a command-line option; it also assumes that files ending in ".ogg" are Ogg-FLAC files.  Other than this, <B><TT>flac</TT></B> makes no assumptions about file extensions, though the convention is that FLAC files have the extension ".flac" (or ".fla" on ancient file systems like FAT-16).
        </P>
        <P>
-               Before going into the full command-line description, a few other things help to sort it out: 1) <B><TT>flac</TT></B> encodes by default, so you must use <B>-d</B> to decode; 2) the options <B><TT>-0</TT></B> .. <B><TT>-8</TT></B> that control the compression level actually are just synonyms for different groups of specific encoding options (described later) and you can get the same effect by using the same options; 3) <B><TT>flac</TT></B> behaves similarly to gzip in the way it handles input and output files.
+               Before going into the full command-line description, a few other things help to sort it out: 1) <B><TT>flac</TT></B> encodes by default, so you must use <B>-d</B> to decode; 2) the options <B><TT>-0</TT></B> .. <B><TT>-8</TT></B> (or <B><TT>--fast</B></TT> and <B><TT>--best</B></TT>) that control the compression level actually are just synonyms for different groups of specific encoding options (described later) and you can get the same effect by using the same options; 3) <B><TT>flac</TT></B> behaves similarly to gzip in the way it handles input and output files.
        </P>
        <P>
                <B><TT>flac</TT></B> will be invoked one of four ways, depending on whether you are encoding, decoding, testing, or analyzing:
@@ -558,6 +558,22 @@
                </TR>
                <TR>
                        <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+                               <TT>--fast</TT>
+                       </TD>
+                       <TD>
+                               Fastest compression.  Currently synonymous with <TT>-0</TT>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+                               <TT>--best</TT>
+                       </TD>
+                       <TD>
+                               Highest compression.  Currently synonymous with <TT>-8</TT>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
                                <TT>-e</TT>
                        </TD>
                        <TD>

diff --git a/man/flac.sgml b/man/flac.sgml
index 8919324..61298d1 100644 (file)
--- a/man/flac.sgml
+++ b/man/flac.sgml
@@ -398,6 +398,24 @@
              </varlistentry>
 
              <varlistentry>
+               <term><option>--fast</option></term>
+
+               <listitem>
+                 <para>Fastest compression.  Currently
+                   synonymous with -0.</para>
+               </listitem>
+             </varlistentry>
+
+             <varlistentry>
+               <term><option>--best</option></term>
+
+               <listitem>
+                 <para>Highest compression.  Currently
+                   synonymous with -8.</para>
+               </listitem>
+             </varlistentry>
+
+             <varlistentry>
                <term><option>-e</option></term>
 
                <listitem>

diff --git a/src/flac/main.c b/src/flac/main.c
index b1b6f07..fa51541 100644 (file)
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
                        aopts.do_residual_text = true;
                else if(0 == strcmp(argv[i], "--a-rtext-"))
                        aopts.do_residual_text = false;
-               else if(0 == strcmp(argv[i], "-0")) {
+               else if(0 == strcmp(argv[i], "-0") || 0 == strcmp(argv[i], "--fast")) {
                        do_exhaustive_model_search = false;
                        do_escape_coding = false;
                        do_mid_side = false;
@@ -313,7 +313,7 @@ int main(int argc, char *argv[])
                        rice_parameter_search_dist = 0;
                        max_lpc_order = 8;
                }
-               else if(0 == strcmp(argv[i], "-8")) {
+               else if(0 == strcmp(argv[i], "-8") || 0 == strcmp(argv[i], "--best")) {
                        do_exhaustive_model_search = true;
                        do_escape_coding = false;
                        do_mid_side = true;
@@ -614,6 +614,7 @@ int long_usage(const char *message, ...)
        fprintf(out, "  -6   : synonymous with -l 8 -b 4608 -m -r 4\n");
        fprintf(out, "  -7   : synonymous with -l 8 -b 4608 -m -e -r 6\n");
        fprintf(out, "  -8   : synonymous with -l 12 -b 4608 -m -e -r 6\n");
+       fprintf(out, "  --fast, --best : synonymous with -0 and -8 respectively\n");
        fprintf(out, "  -e   : do exhaustive model search (expensive!)\n");
        fprintf(out, "  -E   : include escape coding in the entropy coder\n");
        fprintf(out, "  -l # : specify max LPC order; 0 => use only fixed predictors\n");