On Mon, Sep 16, 2013 at 04:02:07PM -0700, Alex Converse wrote:
> This does not add support for any error resiliance tools.
resili_e_nce
> --- a/Changelog
> +++ b/Changelog
> @@ -33,6 +33,7 @@ version 10:
> - avconv -t option can now be used for inputs, to limit the duration of
> data read from an input file
> - incomplete Voxware MetaSound decoder
> +- Error Resiliant AAC syntax (ER AAC LC) decoding
same, error-resilient
> --- a/libavcodec/aacdec.c
> +++ b/libavcodec/aacdec.c
> @@ -752,14 +752,30 @@ static int decode_ga_specific_config(AACContext *ac,
> AVCodecContext *avctx,
> + res_flags = get_bits(gb, 3);
> + if (res_flags) {
> + av_log(avctx, AV_LOG_ERROR,
> + "AAC data resiliance not supported (flags %x)\n",
same
> @@ -2466,6 +2494,65 @@ static int parse_adts_frame_header(AACContext *ac,
> GetBitContext *gb)
>
> + if (chan_config < 0 || chan_config >= 8) {
> + avpriv_request_sample(avctx, "Unknown ER channel configuration %d",
> + ac->oc[1].m4ac.chan_config);
> + err = AVERROR_INVALIDDATA;
AVERROR_PATCHWELCOME?
> +
> + skip_bits_long(gb, get_bits_left(gb));
> + return 0;
> +fail:
> + return err;
I suggest just returning directly above.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
