|
|
|
@@ -1018,6 +1018,8 @@ static unsigned int read_sbr_data(AACContext *ac, SpectralBandReplication *sbr, |
|
|
|
{ |
|
|
|
unsigned int cnt = get_bits_count(gb); |
|
|
|
|
|
|
|
sbr->id_aac = id_aac; |
|
|
|
|
|
|
|
if (id_aac == TYPE_SCE || id_aac == TYPE_CCE) { |
|
|
|
if (read_sbr_single_channel_element(ac, sbr, gb)) { |
|
|
|
sbr_turnoff(sbr); |
|
|
|
@@ -1688,6 +1690,12 @@ void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac, |
|
|
|
int nch = (id_aac == TYPE_CPE) ? 2 : 1; |
|
|
|
int err; |
|
|
|
|
|
|
|
if (id_aac != sbr->id_aac) { |
|
|
|
av_log(ac->avctx, AV_LOG_ERROR, |
|
|
|
"element type mismatch %d != %d\n", id_aac, sbr->id_aac); |
|
|
|
sbr_turnoff(sbr); |
|
|
|
} |
|
|
|
|
|
|
|
if (!sbr->kx_and_m_pushed) { |
|
|
|
sbr->kx[0] = sbr->kx[1]; |
|
|
|
sbr->m[0] = sbr->m[1]; |
|
|
|
|