Commit d83553dd authored by Josh Coalson's avatar Josh Coalson

change the min/max rice partition order for compression levels -0 .. -6

parent b05d4ee3
......@@ -629,7 +629,7 @@
<span class="argument">-0</span>, <span class="argument">--compression-level-0</span>
</td>
<td>
Synonymous with <span class="argument">-l 0 -b 1152 -r 2,2</span>
Synonymous with <span class="argument">-l 0 -b 1152 -r 3</span>
</td>
</tr>
<tr>
......@@ -638,7 +638,7 @@
<span class="argument">-1</span>, <span class="argument">--compression-level-1</span>
</td>
<td>
Synonymous with <span class="argument">-l 0 -b 1152 -M -r 2,2</span>
Synonymous with <span class="argument">-l 0 -b 1152 -M -r 3</span>
</td>
</tr>
<tr>
......@@ -656,7 +656,7 @@
<span class="argument">-3</span>, <span class="argument">--compression-level-3</span>
</td>
<td>
Synonymous with <span class="argument">-l 6 -b 4608 -r 3,3</span>
Synonymous with <span class="argument">-l 6 -b 4608 -r 4</span>
</td>
</tr>
<tr>
......@@ -665,7 +665,7 @@
<span class="argument">-4</span>, <span class="argument">--compression-level-4</span>
</td>
<td>
Synonymous with <span class="argument">-l 8 -b 4608 -M -r 3,3</span>
Synonymous with <span class="argument">-l 8 -b 4608 -M -r 4</span>
</td>
</tr>
<tr>
......@@ -674,7 +674,7 @@
<span class="argument">-5</span>, <span class="argument">--compression-level-5</span>
</td>
<td>
Synonymous with <span class="argument">-l 8 -b 4608 -m -r 3,3</span>
Synonymous with <span class="argument">-l 8 -b 4608 -m -r 5</span>
</td>
</tr>
<tr>
......@@ -683,7 +683,7 @@
<span class="argument">-6</span>, <span class="argument">--compression-level-6</span>
</td>
<td>
Synonymous with <span class="argument">-l 8 -b 4608 -m -r 4</span>
Synonymous with <span class="argument">-l 8 -b 4608 -m -r 6</span>
</td>
</tr>
<tr>
......
......@@ -842,13 +842,13 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *en
* <td>max residual partition order<td>
* <td>rice parameter search dist<td>
* </tr>
* <tr> <td><b>0</b><td> <td>false<td> <td>false<td> <td>tukey(0.5)<td> <td>0<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>2<td> <td>2<td> <td>0<td> </tr>
* <tr> <td><b>1</b><td> <td>true<td> <td>true<td> <td>tukey(0.5)<td> <td>0<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>2<td> <td>2<td> <td>0<td> </tr>
* <tr> <td><b>0</b><td> <td>false<td> <td>false<td> <td>tukey(0.5)<td> <td>0<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>3<td> <td>0<td> </tr>
* <tr> <td><b>1</b><td> <td>true<td> <td>true<td> <td>tukey(0.5)<td> <td>0<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>3<td> <td>0<td> </tr>
* <tr> <td><b>2</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>0<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>3<td> <td>0<td> </tr>
* <tr> <td><b>3</b><td> <td>false<td> <td>false<td> <td>tukey(0.5)<td> <td>6<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>3<td> <td>3<td> <td>0<td> </tr>
* <tr> <td><b>4</b><td> <td>true<td> <td>true<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>3<td> <td>3<td> <td>0<td> </tr>
* <tr> <td><b>5</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>3<td> <td>3<td> <td>0<td> </tr>
* <tr> <td><b>6</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>4<td> <td>0<td> </tr>
* <tr> <td><b>3</b><td> <td>false<td> <td>false<td> <td>tukey(0.5)<td> <td>6<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>4<td> <td>0<td> </tr>
* <tr> <td><b>4</b><td> <td>true<td> <td>true<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>4<td> <td>0<td> </tr>
* <tr> <td><b>5</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>5<td> <td>0<td> </tr>
* <tr> <td><b>6</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>6<td> <td>0<td> </tr>
* <tr> <td><b>7</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>true<td> <td>0<td> <td>6<td> <td>0<td> </tr>
* <tr> <td><b>8</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>12<td> <td>0<td> <td>false<td> <td>false<td> <td>true<td> <td>0<td> <td>6<td> <td>0<td> </tr>
* </table>
......
......@@ -429,7 +429,7 @@
<term><option>-0</option>, <option>--compression-level-0</option></term>
<listitem>
<para>Synonymous with -l 0 -b 1152 -r 2,2</para>
<para>Synonymous with -l 0 -b 1152 -r 3</para>
</listitem>
</varlistentry>
......@@ -437,7 +437,7 @@
<term><option>-1</option>, <option>--compression-level-1</option></term>
<listitem>
<para>Synonymous with -l 0 -b 1152 -M -r 2,2</para>
<para>Synonymous with -l 0 -b 1152 -M -r 3</para>
</listitem>
</varlistentry>
......@@ -453,7 +453,7 @@
<term><option>-3</option>, <option>--compression-level-3</option></term>
<listitem>
<para>Synonymous with -l 6 -b 4608 -r 3,3</para>
<para>Synonymous with -l 6 -b 4608 -r 4</para>
</listitem>
</varlistentry>
......@@ -461,7 +461,7 @@
<term><option>-4</option>, <option>--compression-level-4</option></term>
<listitem>
<para>Synonymous with -l 8 -b 4608 -M -r 3,3</para>
<para>Synonymous with -l 8 -b 4608 -M -r 4</para>
</listitem>
</varlistentry>
......@@ -469,7 +469,7 @@
<term><option>-5</option>, <option>--compression-level-5</option></term>
<listitem>
<para>Synonymous with -l 8 -b 4608 -m -r 3,3</para>
<para>Synonymous with -l 8 -b 4608 -m -r 5</para>
</listitem>
</varlistentry>
......@@ -477,7 +477,7 @@
<term><option>-6</option>, <option>--compression-level-6</option></term>
<listitem>
<para>Synonymous with -l 8 -b 4608 -m -r 4</para>
<para>Synonymous with -l 8 -b 4608 -m -r 6</para>
</listitem>
</varlistentry>
......@@ -566,7 +566,7 @@
<term><option>-r</option> [<replaceable>#</replaceable>,]<replaceable>#</replaceable>, <option>--rice-partition-order</option>=[<replaceable>#</replaceable>,]<replaceable>#</replaceable></term>
<listitem>
<para>Set the [min,]max residual partition order (0..16). min defaults to 0 if unspecified. Default is -r 3,3.</para>
<para>Set the [min,]max residual partition order (0..16). min defaults to 0 if unspecified. Default is -r 5.</para>
</listitem>
</varlistentry>
......
......@@ -1160,13 +1160,13 @@ void show_help(void)
printf(" --tag-from-file=FIELD=FILENAME Like --tag but gets value from file\n");
printf(" -S, --seekpoint={#|X|#x|#s} Add seek point(s)\n");
printf(" -P, --padding=# Write a PADDING block of length #\n");
printf(" -0, --compression-level-0, --fast Synonymous with -l 0 -b 1152 -r 2,2\n");
printf(" -1, --compression-level-1 Synonymous with -l 0 -b 1152 -M -r 2,2\n");
printf(" -0, --compression-level-0, --fast Synonymous with -l 0 -b 1152 -r 3\n");
printf(" -1, --compression-level-1 Synonymous with -l 0 -b 1152 -M -r 3\n");
printf(" -2, --compression-level-2 Synonymous with -l 0 -b 1152 -m -r 3\n");
printf(" -3, --compression-level-3 Synonymous with -l 6 -b 4608 -r 3,3\n");
printf(" -4, --compression-level-4 Synonymous with -l 8 -b 4608 -M -r 3,3\n");
printf(" -5, --compression-level-5 Synonymous with -l 8 -b 4608 -m -r 3,3\n");
printf(" -6, --compression-level-6 Synonymous with -l 8 -b 4608 -m -r 4\n");
printf(" -3, --compression-level-3 Synonymous with -l 6 -b 4608 -r 4\n");
printf(" -4, --compression-level-4 Synonymous with -l 8 -b 4608 -M -r 4\n");
printf(" -5, --compression-level-5 Synonymous with -l 8 -b 4608 -m -r 5\n");
printf(" -6, --compression-level-6 Synonymous with -l 8 -b 4608 -m -r 6\n");
printf(" -7, --compression-level-7 Synonymous with -l 8 -b 4608 -m -e -r 6\n");
printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4608 -m -e -r 6\n");
printf(" -b, --blocksize=# Specify blocksize in samples\n");
......@@ -1433,14 +1433,14 @@ void show_explain(void)
printf(" 576, 1152, 2304, 4608, 256, 512, 1024, 2048,\n");
printf(" 4096 (and 8192 or 16384 if the sample rate is\n");
printf(" >48kHz) for Subset streams.\n");
printf(" -0, --compression-level-0, --fast Synonymous with -l 0 -b 1152 -r 2,2\n");
printf(" -1, --compression-level-1 Synonymous with -l 0 -b 1152 -M -r 2,2\n");
printf(" -0, --compression-level-0, --fast Synonymous with -l 0 -b 1152 -r 3\n");
printf(" -1, --compression-level-1 Synonymous with -l 0 -b 1152 -M -r 3\n");
printf(" -2, --compression-level-2 Synonymous with -l 0 -b 1152 -m -r 3\n");
printf(" -3, --compression-level-3 Synonymous with -l 6 -b 4608 -r 3,3\n");
printf(" -4, --compression-level-4 Synonymous with -l 8 -b 4608 -M -r 3,3\n");
printf(" -5, --compression-level-5 Synonymous with -l 8 -b 4608 -m -r 3,3\n");
printf(" -3, --compression-level-3 Synonymous with -l 6 -b 4608 -r 4\n");
printf(" -4, --compression-level-4 Synonymous with -l 8 -b 4608 -M -r 4\n");
printf(" -5, --compression-level-5 Synonymous with -l 8 -b 4608 -m -r 5\n");
printf(" -5 is the default setting\n");
printf(" -6, --compression-level-6 Synonymous with -l 8 -b 4608 -m -r 4\n");
printf(" -6, --compression-level-6 Synonymous with -l 8 -b 4608 -m -r 6\n");
printf(" -7, --compression-level-7 Synonymous with -l 8 -b 4608 -m -e -r 6\n");
printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4608 -m -e -r 6\n");
printf(" -m, --mid-side Try mid-side coding for each frame\n");
......
......@@ -126,13 +126,13 @@ static struct CompressionLevels {
unsigned max_residual_partition_order;
unsigned rice_parameter_search_dist;
} compression_levels_[] = {
{ false, false, 0, 0, false, false, false, 2, 2, 0 },
{ true , true , 0, 0, false, false, false, 2, 2, 0 },
{ false, false, 0, 0, false, false, false, 0, 3, 0 },
{ true , true , 0, 0, false, false, false, 0, 3, 0 },
{ true , false, 0, 0, false, false, false, 0, 3, 0 },
{ false, false, 6, 0, false, false, false, 3, 3, 0 },
{ true , true , 8, 0, false, false, false, 3, 3, 0 },
{ true , false, 8, 0, false, false, false, 3, 3, 0 },
{ true , false, 8, 0, false, false, false, 0, 4, 0 },
{ false, false, 6, 0, false, false, false, 0, 4, 0 },
{ true , true , 8, 0, false, false, false, 0, 4, 0 },
{ true , false, 8, 0, false, false, false, 0, 5, 0 },
{ true , false, 8, 0, false, false, false, 0, 6, 0 },
{ true , false, 8, 0, false, false, true , 0, 6, 0 },
{ true , false, 12, 0, false, false, true , 0, 6, 0 }
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment