Commit cd28e4b0 authored by alexc's avatar alexc

AAC: Ignore cc_domain for independent (time domain) coupling.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18169 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f96f4301
...@@ -1199,14 +1199,7 @@ static int decode_cce(AACContext * ac, GetBitContext * gb, ChannelElement * che) ...@@ -1199,14 +1199,7 @@ static int decode_cce(AACContext * ac, GetBitContext * gb, ChannelElement * che)
} else } else
coup->ch_select[c] = 2; coup->ch_select[c] = 2;
} }
coup->coupling_point += get_bits1(gb); coup->coupling_point += get_bits1(gb) || (coup->coupling_point>>1);
if (coup->coupling_point == 2) {
av_log(ac->avccontext, AV_LOG_ERROR,
"Independently switched CCE with 'invalid' domain signalled.\n");
memset(coup, 0, sizeof(ChannelCoupling));
return -1;
}
sign = get_bits(gb, 1); sign = get_bits(gb, 1);
scale = pow(2., pow(2., (int)get_bits(gb, 2) - 3)); scale = pow(2., pow(2., (int)get_bits(gb, 2) - 3));
......
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