lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

aacdec: Reconfigure output as needed, disable pop_output_configuration()

Browse source 
Fixes Ticket1694

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-23 00:47:38 +01:00
parent fee5da6b0a
commit 60dbf2eff9
3 changed files with 27 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libavcodec/aacsbr.c
View file

@ -925,11 +925,13 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
{
switch (bs_extension_id) {
case EXTENSION_ID_PS:
if (!ac->oc[1].m4ac.ps) {
av_log(ac->avctx, AV_LOG_ERROR, "Parametric Stereo signaled to be not-present but was found in the bitstream.\n");
skip_bits_long(gb, *num_bits_left); // bs_fill_bits
*num_bits_left = 0;
} else {
if (ac->oc[1].m4ac.ps != 1) {
av_log(ac->avctx, AV_LOG_DEBUG, "Parametric Stereo was found in the bitstream.\n");
ac->oc[1].m4ac.ps = 1;
ff_aac_output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags,
ac->oc[1].status, 1);
}
av_assert0(ac->oc[1].m4ac.ps);
#if 1
*num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left);
#else
@ -937,7 +939,6 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
skip_bits_long(gb, *num_bits_left); // bs_fill_bits
*num_bits_left = 0;
#endif
}
break;
default:
// some files contain 0-padding