[FFmpeg-devel] fix for https://trac.ffmpeg.org/ticket/9057

From: KM <the.real.laplace@gmail.com>

---
 libavcodec/aacdec_template.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Any feedback on this? Would also like this fixed.

Am Do., 21. Jan. 2021 um 17:59 Uhr schrieb <konstantin@boffins.se>:
>
> From: KM <the.real.laplace@gmail.com>
>
> ---
>  libavcodec/aacdec_template.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
> index fbe3074..3c2dbe3 100644
> --- a/libavcodec/aacdec_template.c
> +++ b/libavcodec/aacdec_template.c
> @@ -639,11 +639,14 @@ static int set_default_channel_config(AACContext *ac, AVCodecContext *avctx,
>       * As actual intended 7.1(wide) streams are very rare, default to assuming a
>       * 7.1 layout was intended.
>       */
> -    if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT && (!ac || !ac->warned_71_wide++)) {
> -        av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout"
> -               " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode"
> -               " according to the specification instead.\n", FF_COMPLIANCE_STRICT);
> +    if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT) {
>          layout_map[2][2] = AAC_CHANNEL_SIDE;
> +
> +        if (!ac || !ac->warned_71_wide++) {
> +            av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout"
> +                   " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode"
> +                   " according to the specification instead.\n", FF_COMPLIANCE_STRICT);

I will push this if there are no objections.

Carl Eugen

Quoting Carl Eugen Hoyos (2021-02-03 23:05:08)
> Am Do., 21. Jan. 2021 um 17:59 Uhr schrieb <konstantin@boffins.se>:
> >
> > From: KM <the.real.laplace@gmail.com>
> >
> > ---
> >  libavcodec/aacdec_template.c | 11 +++++++----
> >  1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
> > index fbe3074..3c2dbe3 100644
> > --- a/libavcodec/aacdec_template.c
> > +++ b/libavcodec/aacdec_template.c
> > @@ -639,11 +639,14 @@ static int set_default_channel_config(AACContext *ac, AVCodecContext *avctx,
> >       * As actual intended 7.1(wide) streams are very rare, default to assuming a
> >       * 7.1 layout was intended.
> >       */
> > -    if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT && (!ac || !ac->warned_71_wide++)) {
> > -        av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout"
> > -               " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode"
> > -               " according to the specification instead.\n", FF_COMPLIANCE_STRICT);
> > +    if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT) {
> >          layout_map[2][2] = AAC_CHANNEL_SIDE;
> > +
> > +        if (!ac || !ac->warned_71_wide++) {
> > +            av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout"
> > +                   " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode"
> > +                   " according to the specification instead.\n", FF_COMPLIANCE_STRICT);
> 
> I will push this if there are no objections.

At the very least it needs a better commit message that explains what is
done rather than "fix bug"

Am Do., 21. Jan. 2021 um 17:59 Uhr schrieb <konstantin@boffins.se>:
>
> From: KM <the.real.laplace@gmail.com>
>
> ---
>  libavcodec/aacdec_template.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
> index fbe3074..3c2dbe3 100644
> --- a/libavcodec/aacdec_template.c
> +++ b/libavcodec/aacdec_template.c
> @@ -639,11 +639,14 @@ static int set_default_channel_config(AACContext *ac, AVCodecContext *avctx,
>       * As actual intended 7.1(wide) streams are very rare, default to assuming a
>       * 7.1 layout was intended.
>       */
> -    if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT && (!ac || !ac->warned_71_wide++)) {
> -        av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout"
> -               " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode"
> -               " according to the specification instead.\n", FF_COMPLIANCE_STRICT);
> +    if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT) {
>          layout_map[2][2] = AAC_CHANNEL_SIDE;
> +
> +        if (!ac || !ac->warned_71_wide++) {
> +            av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout"
> +                   " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode"
> +                   " according to the specification instead.\n", FF_COMPLIANCE_STRICT);
> +        }

Patch applied.

Thank you, Carl Eugen