Module: libav Branch: release/11 Commit: aeb9c8627d5e475628963ee27be8f122bd7b5e2f
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Thu Jun 4 10:19:50 2015 +0200 aac: Wait to know the channels before allocating frame The channel configuration can be delivered only by the PCE, try to parse it first and not try to decode until a channel configuration is set. CC: [email protected] --- libavcodec/aacdec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 2258aed..fe30683 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2783,8 +2783,9 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, } } - if ((err = frame_configure_elements(avctx)) < 0) - goto fail; + if (avctx->channels) + if ((err = frame_configure_elements(avctx)) < 0) + goto fail; // The FF_PROFILE_AAC_* defines are all object_type - 1 // This may lead to an undefined profile being signaled @@ -2795,6 +2796,9 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, while ((elem_type = get_bits(gb, 3)) != TYPE_END) { elem_id = get_bits(gb, 4); + if (!avctx->channels && elem_type != TYPE_PCE) + goto fail; + if (elem_type < TYPE_DSE) { if (!(che=get_che(ac, elem_type, elem_id))) { av_log(ac->avctx, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", @@ -2881,6 +2885,11 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, } } + if (!avctx->channels) { + *got_frame_ptr = 0; + return 0; + } + spectral_to_sample(ac); multiplier = (ac->oc[1].m4ac.sbr == 1) ? ac->oc[1].m4ac.ext_sample_rate > ac->oc[1].m4ac.sample_rate : 0; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
