Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Viraaj Raulgaonkar <viraajraulgkar@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Viraaj Raulgaonkar <viraajraulgkar@gmail.com>
Subject: [FFmpeg-devel] [PATCH v4 2/2] avformat/riffdec: warn on invalid sample rate
Date: Sat,  1 Feb 2025 16:10:57 +0530
Message-ID: <20250201104057.1615411-2-viraajraulgkar@gmail.com> (raw)
In-Reply-To: <20250201104057.1615411-1-viraajraulgkar@gmail.com>

If strict_std_compliance < FF_COMPLIANCE_STRICT, then warn the user of
the invalid sample rate instead of returning an error. In certain cases
the sample rate can get decoded later on during demux.

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

_______________________________________________
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".

  reply	other threads:[~2025-02-01 10:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-01 10:40 [FFmpeg-devel] [PATCH v4 1/2] avformat/riffdec: change declaration of ff_get_wav_header() Viraaj Raulgaonkar
2025-02-01 10:40 ` Viraaj Raulgaonkar [this message]
2025-02-02 19:26 ` Andreas Rheinhardt
2025-02-03  2:25   ` Viraaj Raulgaonkar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250201104057.1615411-2-viraajraulgkar@gmail.com \
    --to=viraajraulgkar@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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