Mercurial > libavcodec.hg
comparison aac.c @ 9251:3fc2f6c6b684 libavcodec
AAC: Ignore cc_domain for independent (time domain) coupling.
author | alexc |
---|---|
date | Mon, 23 Mar 2009 05:13:26 +0000 |
parents | 4172c9ef331a |
children | 54bc8a2727b0 |
comparison
equal
deleted
inserted
replaced
9250:ce6204c184c1 | 9251:3fc2f6c6b684 |
---|---|
1197 if (coup->ch_select[c] == 3) | 1197 if (coup->ch_select[c] == 3) |
1198 num_gain++; | 1198 num_gain++; |
1199 } else | 1199 } else |
1200 coup->ch_select[c] = 2; | 1200 coup->ch_select[c] = 2; |
1201 } | 1201 } |
1202 coup->coupling_point += get_bits1(gb); | 1202 coup->coupling_point += get_bits1(gb) || (coup->coupling_point>>1); |
1203 | |
1204 if (coup->coupling_point == 2) { | |
1205 av_log(ac->avccontext, AV_LOG_ERROR, | |
1206 "Independently switched CCE with 'invalid' domain signalled.\n"); | |
1207 memset(coup, 0, sizeof(ChannelCoupling)); | |
1208 return -1; | |
1209 } | |
1210 | 1203 |
1211 sign = get_bits(gb, 1); | 1204 sign = get_bits(gb, 1); |
1212 scale = pow(2., pow(2., (int)get_bits(gb, 2) - 3)); | 1205 scale = pow(2., pow(2., (int)get_bits(gb, 2) - 3)); |
1213 | 1206 |
1214 if ((ret = decode_ics(ac, sce, gb, 0, 0))) | 1207 if ((ret = decode_ics(ac, sce, gb, 0, 0))) |