[FFmpeg-devel] [PATCH v5 2/2] avformat/riffdec: warn on invalid sample rate

[Viraaj Raulgaonkar]

On Mon, Feb 3, 2025 at 9:55 AM Viraaj Raulgaonkar
<viraajraulgkar at gmail.com> wrote:
>
> If strict_std_compliance < FF_COMPLIANCE_STRICT, warn the user of the
> invalid sample rate instead of returning an error. In certain cases the
> sample rate can get decoded later on.
>
> Fixes Trac Ticket #11361.
> ---
>  libavformat/riffdec.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> index 2b269b1682..a3eee43a41 100644
> --- a/libavformat/riffdec.c
> +++ b/libavformat/riffdec.c
> @@ -180,9 +180,12 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
>      par->bit_rate = bitrate;
>
>      if (par->sample_rate <= 0) {
> -        av_log(s, AV_LOG_ERROR,
> +        int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT;
> +        av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
>                 "Invalid sample rate: %d\n", par->sample_rate);
> -        return AVERROR_INVALIDDATA;
> +        if (strict)
> +            return AVERROR_INVALIDDATA;
> +        par->sample_rate = 0;
>      }
>      if (par->codec_id == AV_CODEC_ID_AAC_LATM) {
>          /* Channels and sample_rate values are those prior to applying SBR
> --
> 2.39.5
>

Ping