virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

cosmetics: rename find_subblock_rice_params() to find_subframe_rice_params()

Browse Source 
Originally committed as revision 24629 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles
2010-07-31 20:19:07 +00:00
parent 089c18f315
commit 675eb677c5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/flacenc.c
+7 -7
View File
@@ -606,7 +606,7 @@ static int get_max_p_order(int max_porder, int n, int order)
} }
static uint32_t find_subblock_rice_params(FlacEncodeContext *s, static uint32_t find_subframe_rice_params(FlacEncodeContext *s,
FlacSubframe *sub, int pred_order) FlacSubframe *sub, int pred_order)
{ {
int pmin = get_max_p_order(s->options.min_partition_order, int pmin = get_max_p_order(s->options.min_partition_order,
@@ -826,7 +826,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
bits[0] = UINT32_MAX; bits[0] = UINT32_MAX;
for (i = min_order; i <= max_order; i++) { for (i = min_order; i <= max_order; i++) {
encode_residual_fixed(res, smp, n, i); encode_residual_fixed(res, smp, n, i);
bits[i] = find_subblock_rice_params(s, sub, i); bits[i] = find_subframe_rice_params(s, sub, i);
if (bits[i] < bits[opt_order]) if (bits[i] < bits[opt_order])
opt_order = i; opt_order = i;
} }
@@ -834,7 +834,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
sub->type_code = sub->type | sub->order; sub->type_code = sub->type | sub->order;
if (sub->order != max_order) { if (sub->order != max_order) {
encode_residual_fixed(res, smp, n, sub->order); encode_residual_fixed(res, smp, n, sub->order);
return find_subblock_rice_params(s, sub, sub->order); return find_subframe_rice_params(s, sub, sub->order);
} }
return bits[sub->order]; return bits[sub->order];
} }
@@ -860,7 +860,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
if (order < 0) if (order < 0)
order = 0; order = 0;
encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]); encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]);
bits[i] = find_subblock_rice_params(s, sub, order+1); bits[i] = find_subframe_rice_params(s, sub, order+1);
if (bits[i] < bits[opt_index]) { if (bits[i] < bits[opt_index]) {
opt_index = i; opt_index = i;
opt_order = order; opt_order = order;
@@ -874,7 +874,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
bits[0] = UINT32_MAX; bits[0] = UINT32_MAX;
for (i = min_order-1; i < max_order; i++) { for (i = min_order-1; i < max_order; i++) {
encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]);
bits[i] = find_subblock_rice_params(s, sub, i+1); bits[i] = find_subframe_rice_params(s, sub, i+1);
if (bits[i] < bits[opt_order]) if (bits[i] < bits[opt_order])
opt_order = i; opt_order = i;
} }
@@ -892,7 +892,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
if (i < min_order-1 || i >= max_order || bits[i] < UINT32_MAX) if (i < min_order-1 || i >= max_order || bits[i] < UINT32_MAX)
continue; continue;
encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]);
bits[i] = find_subblock_rice_params(s, sub, i+1); bits[i] = find_subframe_rice_params(s, sub, i+1);
if (bits[i] < bits[opt_order]) if (bits[i] < bits[opt_order])
opt_order = i; opt_order = i;
} }
@@ -908,7 +908,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
encode_residual_lpc(res, smp, n, sub->order, sub->coefs, sub->shift); encode_residual_lpc(res, smp, n, sub->order, sub->coefs, sub->shift);
return find_subblock_rice_params(s, sub, sub->order); return find_subframe_rice_params(s, sub, sub->order);
} }