From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id D12254AAB8 for ; Fri, 21 Nov 2025 13:14:24 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'dgPXEJ2ybcgxDijshGJdt4eqZd2YBz5MoqucwU9tn8w=', expected b'fzo7GUY0raqBGQzaEt/+z39j9hrTXHOoBxIGY8Cd72E=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763730850; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=dgPXEJ2ybcgxDijshGJdt4eqZd2YBz5MoqucwU9tn8w=; b=ZLo3Ih6lmq9UFY+6AAIaSxfUMl4zk+WBNnsCouLnq6uBkkfE1zByfHONVjr1luZJgZqxX kummuF7zGlZIJbkdugjTJjTqRVbHicdjb0ZBb+qwE/Q/z7rcmwqUrsMEGrprATE3a0CRP6V PmVdbbg/nTgOyQgTMaJg9B8ZmmKR/EXA/ysMSbnGEuHEVYPQg3qgZDLcBG+bCEozki1k6OT 5PMz+q04Y2sFK3wWLcTl2/F4vlNBRtJd0dkbR4iwZFkXOnCP7G3q22QkYr3czcofGju/HZo g+ZbKz9qMLrw5XVFj0765kt3iPYTijHB3b9r/+Keb/eJvAi0PZ8a9aysNuQQ== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id C547168FFE1; Fri, 21 Nov 2025 15:14:10 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1763730849; b=ToEPmv9EMMS23qx0RmRG2IQWgpV+GbFfujVVwQ9Godb5OR09Uid33zr085j4rcO2DwEsx iwC6U5g4+Ryx1V6mGrxpHUFUIGhdQ/E4ODw0YhBKgUTYIL2nspdqIBqw8knATTfiYq81ugz tdOjybay8KL0uESXITAOJlrs2SHakjBsWN7gvg5q9rv5C3l6h1gVHUmk2FR/vz2/Nd2Rmlq bm/jtC7TC33exYM6/81HZ9d+CwS5DtqqNxB1g4bP6bmLQ3wk2dYoJPefh/KnBOnIP+iCXEK LgXIwxV0L4EqMFi8/5nmIsFsK6ZAI+H7mpbUNd6nVkqefZMcTW1gr3qAoToA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1763730849; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=1+glEvoPuRQKnW17j3I4ljQM2gIofSkPoylzuGW7y7A=; b=EmJxWmmNDsdjc15OWTovuzZMINK7Wvv2a70tpFchRFUmn/XbhkipsGX3MuIQ9Npx//AIo Tqpw9NwLr3yV/QO/wT7WLcnjOT+tDDmxf+/QpiNpprcX6+1wZ/KRjYL85di34NJZs/F3DsJ hu3O9PNWHjvE5dVchPfm8kxwBw1fNXJYSMjNlsa3OTTGVJ4zwLv79ceNl5ZXAlARV/yFqVG JiKgewL1hUrTxmYhENKLqkDb/SOoe7BG0E6NqEVJU1eKaCP67VYEsqz6DpFOtvVSSzrKI1a aunKZAQ8ijGP+0MbO5XLlICNYF2ITPYxlFRACE4UVp5qpEC5+eneW6rlQFDQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763730841; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=fzo7GUY0raqBGQzaEt/+z39j9hrTXHOoBxIGY8Cd72E=; b=eRvGH8xgs0HE6qVt22NoBxdmoXZH3ApRT/ti/w/XocNXbwac/ZSGRV5dlAe684julNviE HVOB7BKp/20f3AGeTd1XE4FPuWAbIMe32E1SGHF1MshR4ljwy4Za7OYpdVxniimAnoDUSHE cH0ntYCn5iZi/4FzxcsQ/Zw779UDgAeN7uP0MXRSGYm/sfPdaEvAk8Aq0MUW0sndttq/5gT tuaLvxKJM3ueVHm9RVEWZbaB3WZxOA30uSK7HGt9scyUBO6yVRRvEJl6TrJHM9V64BO8WCe X0kEF3y/9di3R5nyhoSgSpampEaJv/OTIy1Ew+DRBIdySPVv9dXsDnFpW99Q== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1740568FF45 for ; Fri, 21 Nov 2025 15:14:01 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Nov 2025 13:14:00 -0000 Message-ID: <176373084123.59.8392422213405997562@2cb04c0e5124> Message-ID-Hash: C6GBTQNAZBWFRCEGOBEUPMWIEEIBYRKF X-Message-ID-Hash: C6GBTQNAZBWFRCEGOBEUPMWIEEIBYRKF X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/mov: fix incorrect sample rate by parse srat box (PR #20990) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Zhao Zhili via ffmpeg-devel Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: 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 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