* [FFmpeg-devel] [PATCH] avformat/mov: fix incorrect sample rate by parse srat box (PR #20990)
@ 2025-11-21 13:14 Zhao Zhili via ffmpeg-devel
0 siblings, 0 replies; only message in thread
From: Zhao Zhili via ffmpeg-devel @ 2025-11-21 13:14 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
PR #20990 opened by Zhao Zhili (quink)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20990
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20990.patch
>From f4fe9004a5ad6d3328e2acf79272aeafde0e1bf2 Mon Sep 17 00:00:00 2001
From: Zhao Zhili <zhilizhao@tencent.com>
Date: Fri, 21 Nov 2025 20:43:56 +0800
Subject: [PATCH] avformat/mov: fix incorrect sample rate by parse srat box
---
libavformat/isom.h | 1 +
libavformat/mov.c | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 55bc2827b4..694d14eeb6 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -258,6 +258,7 @@ typedef struct MOVStreamContext {
int last_stsd_index;
int stsd_count;
int stsd_version;
+ int sample_entry_version;
int32_t *display_matrix;
AVStereo3D *stereo3d;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index eab9f79577..9c1941220d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1075,6 +1075,45 @@ fail:
}
#endif
+static int mov_read_srat(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+{
+ MOVStreamContext *sc;
+ AVStream *st;
+ int32_t sample_rate;
+
+ if (atom.size < 8 || c->fc->nb_streams < 1)
+ return 0;
+
+ st = c->fc->streams[c->fc->nb_streams-1];
+ if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+ av_log(c->fc, AV_LOG_WARNING, "'srat' within non-audio sample entry, skip\n");
+ return 0;
+ }
+
+ sc = st->priv_data;
+ if (!c->isom || sc->stsd_version != 1 || sc->sample_entry_version != 1) {
+ av_log(c->fc, AV_LOG_WARNING,
+ "'srat' requires isom with stsd version 1 and sample entry version 1, "
+ "current isom %d, stsd version %d, sample entry version %d, skip\n",
+ c->isom, sc->stsd_version, sc->sample_entry_version);
+ return 0;
+ }
+
+ avio_skip(pb, 4); // version+flags
+ sample_rate = avio_rb32(pb);
+ if (sample_rate > 0) {
+ av_log(c->fc, AV_LOG_DEBUG,
+ "overwrite sample rate from %d to %d by 'srat'\n",
+ st->codecpar->sample_rate, sample_rate);
+ st->codecpar->sample_rate = sample_rate;
+ } else {
+ av_log(c->fc, AV_LOG_WARNING,
+ "ignore invalid sample rate %d in 'srat'\n", sample_rate);
+ }
+
+ return 0;
+}
+
static int mov_read_dec3(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
AVStream *st;
@@ -2733,6 +2772,7 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb,
AVDictionaryEntry *compatible_brands = av_dict_get(c->fc->metadata, "compatible_brands", NULL, AV_DICT_MATCH_CASE);
int channel_count;
+ sc->sample_entry_version = version;
avio_rb16(pb); /* revision level */
id = avio_rl32(pb); /* vendor */
av_dict_set(&st->metadata, "vendor_id", av_fourcc2str(id), 0);
@@ -9479,6 +9519,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = {
#if CONFIG_IAMFDEC
{ MKTAG('i','a','c','b'), mov_read_iacb },
#endif
+{ MKTAG('s','r','a','t'), mov_read_srat },
{ 0, NULL }
};
--
2.49.1
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-11-21 13:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-11-21 13:14 [FFmpeg-devel] [PATCH] avformat/mov: fix incorrect sample rate by parse srat box (PR #20990) Zhao Zhili via ffmpeg-devel
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