* [FFmpeg-devel] [PATCH v2] avformat/riffdec: warn on invalid sample rate @ 2025-01-26 14:13 Viraaj Raulgaonkar 2025-01-26 19:56 ` Marton Balint 0 siblings, 1 reply; 3+ messages in thread From: Viraaj Raulgaonkar @ 2025-01-26 14:13 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Viraaj Raulgaonkar 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; } 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". ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2] avformat/riffdec: warn on invalid sample rate 2025-01-26 14:13 [FFmpeg-devel] [PATCH v2] avformat/riffdec: warn on invalid sample rate Viraaj Raulgaonkar @ 2025-01-26 19:56 ` Marton Balint 2025-01-30 10:05 ` Viraaj Raulgaonkar 0 siblings, 1 reply; 3+ messages in thread From: Marton Balint @ 2025-01-26 19:56 UTC (permalink / raw) To: FFmpeg development discussions and patches 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". ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2] avformat/riffdec: warn on invalid sample rate 2025-01-26 19:56 ` Marton Balint @ 2025-01-30 10:05 ` Viraaj Raulgaonkar 0 siblings, 0 replies; 3+ messages in thread From: Viraaj Raulgaonkar @ 2025-01-30 10:05 UTC (permalink / raw) To: FFmpeg development discussions and patches Hi Marton, On Mon, Jan 27, 2025 at 1:25 AM Marton Balint <cus@passwd.hu> wrote: > > > > 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. That makes a lot of sense. > > 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 for the feedback! I'll update the patch accordingly and send a revised patch soon. Regards, Viraaj > > 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". _______________________________________________ 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". ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-30 10:05 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2025-01-26 14:13 [FFmpeg-devel] [PATCH v2] avformat/riffdec: warn on invalid sample rate Viraaj Raulgaonkar 2025-01-26 19:56 ` Marton Balint 2025-01-30 10:05 ` Viraaj Raulgaonkar
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git