Commit 225c3042 authored by Justin Ruggles's avatar Justin Ruggles
Browse files

commit more OKed parts of the E-AC-3 decoder

Originally committed as revision 15068 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d82bdf68
......@@ -769,7 +769,7 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
/* TODO: spectral extension coordinates */
/* coupling strategy */
if (get_bits1(gbc)) {
if (s->eac3 ? s->cpl_strategy_exists[blk] : get_bits1(gbc)) {
memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
if (!s->eac3)
s->cpl_in_use[blk] = get_bits1(gbc);
......@@ -855,8 +855,9 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
for (ch = 1; ch <= fbw_channels; ch++) {
if (s->channel_in_cpl[ch]) {
if (get_bits1(gbc)) {
if ((s->eac3 && s->first_cpl_coords[ch]) || get_bits1(gbc)) {
int master_cpl_coord, cpl_coord_exp, cpl_coord_mant;
s->first_cpl_coords[ch] = 0;
cpl_coords_exist = 1;
master_cpl_coord = 3 * get_bits(gbc, 2);
for (bnd = 0; bnd < s->num_cpl_bands; bnd++) {
......@@ -872,6 +873,9 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
av_log(s->avctx, AV_LOG_ERROR, "new coupling coordinates must be present in block 0\n");
return -1;
}
} else {
/* channel not in coupling */
s->first_cpl_coords[ch] = 1;
}
}
/* phase flags */
......
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