[FFmpeg-devel] [PATCH] Add AAC_xHE case to aacdec_template.c for demuxing

[Lynne]

Apr 2, 2024, 23:45 by ffmpeg-devel at ffmpeg.org:

> From: Ted Meyer <tmathmeyer at chromium.org>
>
> The parser needs to be able to be created when demuxing, otherwise the
> channel count and layout can't be successfully generated.
>
> Signed-off-by: Ted Meyer <tmathmeyer at chromium.org>
> ---
>  libavcodec/aacdec_template.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
> index aa856d7fe1..9afa3aba83 100644
> --- a/libavcodec/aacdec_template.c
> +++ b/libavcodec/aacdec_template.c
> @@ -1022,6 +1022,7 @@ static int decode_audio_specific_config_gb(AACDecContext *ac,
>  case AOT_AAC_LTP:
>  case AOT_ER_AAC_LC:
>  case AOT_ER_AAC_LD:
> +    case AOT_USAC_NOSBR:
>  if ((ret = decode_ga_specific_config(ac, avctx, gb, get_bit_alignment,
>  m4ac, m4ac->chan_config)) < 0)
>  return ret;
>

That's a really invalid workaround which also disables warning users
that xHE-AAC is not implemented.
The xHE-AAC header is not an extension of the GA header to decode
anything properly, even without SBR.

I'll be posting patches in a few days to add xHE-AAC decoding support
which also fixes remuxing.