Commit 4d7a4215 authored by Justin Ruggles's avatar Justin Ruggles
Browse files

ac3enc: put the counting of stereo rematrixing bits in the same place to

make the code easier to understand.
parent 257de756
......@@ -838,10 +838,6 @@ static void count_frame_bits_fixed(AC3EncodeContext *s)
if (!blk)
frame_bits++;
/* stereo rematrixing */
if (s->channel_mode == AC3_CHMODE_STEREO)
frame_bits++;
/* exponent strategy */
frame_bits += 2 * s->fbw_channels;
if (s->lfe_on)
......@@ -931,8 +927,9 @@ static void count_frame_bits(AC3EncodeContext *s)
/* audio blocks */
for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) {
/* stereo rematrixing */
if (s->channel_mode == AC3_CHMODE_STEREO &&
s->blocks[blk].new_rematrixing_strategy) {
if (s->channel_mode == AC3_CHMODE_STEREO) {
frame_bits++;
if (s->blocks[blk].new_rematrixing_strategy)
frame_bits += s->num_rematrixing_bands;
}
......
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