From d83553dd2b4ffd3783019bbf27fec471e17b2611 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Tue, 6 Feb 2007 04:48:26 +0000 Subject: [PATCH] change the min/max rice partition order for compression levels -0 .. -6 --- doc/html/documentation_tools_flac.html | 12 ++++++------ include/FLAC/stream_encoder.h | 12 ++++++------ man/flac.sgml | 14 +++++++------- src/flac/main.c | 24 ++++++++++++------------ src/libFLAC/stream_encoder.c | 12 ++++++------ 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/doc/html/documentation_tools_flac.html b/doc/html/documentation_tools_flac.html index a55a7a1..aefd26c 100644 --- a/doc/html/documentation_tools_flac.html +++ b/doc/html/documentation_tools_flac.html @@ -629,7 +629,7 @@ -0, --compression-level-0 - Synonymous with -l 0 -b 1152 -r 2,2 + Synonymous with -l 0 -b 1152 -r 3 @@ -638,7 +638,7 @@ -1, --compression-level-1 - Synonymous with -l 0 -b 1152 -M -r 2,2 + Synonymous with -l 0 -b 1152 -M -r 3 @@ -656,7 +656,7 @@ -3, --compression-level-3 - Synonymous with -l 6 -b 4608 -r 3,3 + Synonymous with -l 6 -b 4608 -r 4 @@ -665,7 +665,7 @@ -4, --compression-level-4 - Synonymous with -l 8 -b 4608 -M -r 3,3 + Synonymous with -l 8 -b 4608 -M -r 4 @@ -674,7 +674,7 @@ -5, --compression-level-5 - Synonymous with -l 8 -b 4608 -m -r 3,3 + Synonymous with -l 8 -b 4608 -m -r 5 @@ -683,7 +683,7 @@ -6, --compression-level-6 - Synonymous with -l 8 -b 4608 -m -r 4 + Synonymous with -l 8 -b 4608 -m -r 6 diff --git a/include/FLAC/stream_encoder.h b/include/FLAC/stream_encoder.h index eb37c89..bf389d2 100644 --- a/include/FLAC/stream_encoder.h +++ b/include/FLAC/stream_encoder.h @@ -842,13 +842,13 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *en * max residual partition order * rice parameter search dist * - * 0 false false tukey(0.5) 0 0 false false false 2 2 0 - * 1 true true tukey(0.5) 0 0 false false false 2 2 0 + * 0 false false tukey(0.5) 0 0 false false false 0 3 0 + * 1 true true tukey(0.5) 0 0 false false false 0 3 0 * 2 true false tukey(0.5) 0 0 false false false 0 3 0 - * 3 false false tukey(0.5) 6 0 false false false 3 3 0 - * 4 true true tukey(0.5) 8 0 false false false 3 3 0 - * 5 true false tukey(0.5) 8 0 false false false 3 3 0 - * 6 true false tukey(0.5) 8 0 false false false 0 4 0 + * 3 false false tukey(0.5) 6 0 false false false 0 4 0 + * 4 true true tukey(0.5) 8 0 false false false 0 4 0 + * 5 true false tukey(0.5) 8 0 false false false 0 5 0 + * 6 true false tukey(0.5) 8 0 false false false 0 6 0 * 7 true false tukey(0.5) 8 0 false false true 0 6 0 * 8 true false tukey(0.5) 12 0 false false true 0 6 0 * diff --git a/man/flac.sgml b/man/flac.sgml index ef6a65d..21822c7 100644 --- a/man/flac.sgml +++ b/man/flac.sgml @@ -429,7 +429,7 @@ , - Synonymous with -l 0 -b 1152 -r 2,2 + Synonymous with -l 0 -b 1152 -r 3 @@ -437,7 +437,7 @@ , - Synonymous with -l 0 -b 1152 -M -r 2,2 + Synonymous with -l 0 -b 1152 -M -r 3 @@ -453,7 +453,7 @@ , - Synonymous with -l 6 -b 4608 -r 3,3 + Synonymous with -l 6 -b 4608 -r 4 @@ -461,7 +461,7 @@ , - Synonymous with -l 8 -b 4608 -M -r 3,3 + Synonymous with -l 8 -b 4608 -M -r 4 @@ -469,7 +469,7 @@ , - Synonymous with -l 8 -b 4608 -m -r 3,3 + Synonymous with -l 8 -b 4608 -m -r 5 @@ -477,7 +477,7 @@ , - Synonymous with -l 8 -b 4608 -m -r 4 + Synonymous with -l 8 -b 4608 -m -r 6 @@ -566,7 +566,7 @@ [#,]#, =[#,]# - Set the [min,]max residual partition order (0..16). min defaults to 0 if unspecified. Default is -r 3,3. + Set the [min,]max residual partition order (0..16). min defaults to 0 if unspecified. Default is -r 5. diff --git a/src/flac/main.c b/src/flac/main.c index ed3dfda..6f0d72a 100644 --- a/src/flac/main.c +++ b/src/flac/main.c @@ -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"); diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index cd579f0..58620de 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -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 } }; -- 2.7.4