Re: [FFmpeg-devel] [PATCH v2] avformat/riffdec: warn on invalid sample rate

[Marton Balint <cus@passwd.hu>]

On Sun, 26 Jan 2025, Viraaj Raulgaonkar wrote:

> Instead of returning an error for invalid sample rates, warn the user
> and set sample_rate to INT_MAX. This allows the sample rate to be
> decoded in certain cases.
>
> Fixes Trac Ticket #11361.
> ---
> libavformat/riffdec.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> index b7a85a6ab2..c8b50d5f35 100644
> --- a/libavformat/riffdec.c
> +++ b/libavformat/riffdec.c
> @@ -180,9 +180,9 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
>     par->bit_rate = bitrate;
>
>     if (par->sample_rate <= 0) {
> -        av_log(logctx, AV_LOG_ERROR,
> +        av_log(logctx, AV_LOG_WARNING,
>                "Invalid sample rate: %d\n", par->sample_rate);
> -        return AVERROR_INVALIDDATA;
> +        par->sample_rate = INT_MAX;

Making up a false sample rate is not acceptable. You should set it to 0 
instead, at least that can be interpreted as unknown.

Also you should check AVFormatContext strict_std_compliance and reject or 
allow based on that:

Something like:

int strict = logctx->strict_std_compliance >= FF_COMPLIANCE_STRICT;
av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING, "Invalid sample rate: %d\n", par->sample_rate)
if (strict)
     return AVERROR_INVALIDDATA;
par->sample_rate = 0;

logctx should be an AVFormatContext, so you should change the type from 
void* to that.

Thanks,
Marton


>     }
>     if (par->codec_id == AV_CODEC_ID_AAC_LATM) {
>         /* Channels and sample_rate values are those prior to applying SBR
> -- 
> 2.39.5
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".