From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 7FA144C990
for <ffmpegdev@gitmailbox.com>; Thu, 10 Apr 2025 09:03:53 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20E7168BE34;
Thu, 10 Apr 2025 12:03:49 +0300 (EEST)
Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com
[209.85.218.45])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2A9568BA6E
for <ffmpeg-devel@ffmpeg.org>; Thu, 10 Apr 2025 12:03:42 +0300 (EEST)
Received: by mail-ej1-f45.google.com with SMTP id
a640c23a62f3a-ac29af3382dso101913566b.2
for <ffmpeg-devel@ffmpeg.org>; Thu, 10 Apr 2025 02:03:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=unified-streaming.com; s=google; t=1744275822; x=1744880622; darn=ffmpeg.org;
h=message-id:in-reply-to:to:references:date:subject:mime-version
:content-transfer-encoding:from:from:to:cc:subject:date:message-id
:reply-to; bh=pSZf9FA4o0gdnB2XDbOC9SgGi++QYdmasKqsyAQWTcU=;
b=kguKzdVTbVUwGbAbdN6Iu8ajCzzXuej0rpizy6Z24sM7xm5/OKEa7U5u0yD40hMAEm
7LpspGZtLayiV2+CdbK5O+K5ibopywplpTPX2LbE2rUsPZxoXiyLSyvRUW5NXYGBy9UY
t9pRKNdYNmkshcrGT4kY0RCKnIVrT2oG+9lGHlwuycLiKHzrqUuQLiEBZuTV7XyaGPDY
LfEfUTEVSqDeRTHAbuG85c/RMDopFLnhhFEIuJj2z/hm6hO2nhOYtz0FYPmQBIuCbwU6
KGPuzNngjGpg871qiQ8ahPK7uyBJPePQ6IvOFOpx26IGowtXk8E397a0/j7GEq4QXjUg
Nhuw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744275822; x=1744880622;
h=message-id:in-reply-to:to:references:date:subject:mime-version
:content-transfer-encoding:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=pSZf9FA4o0gdnB2XDbOC9SgGi++QYdmasKqsyAQWTcU=;
b=KGtKwux/CgwyeehttIs5tlrOB4zW54gAzH/NHG6+MJss46grMu5kMi3PHnj3XvOtsh
VeCGehG6sH1E59AWwCs3F/FqUAl3fYtClFQDq2wh4Qp4/lLsyGl5dC+jQkGWEd7zQwYx
136ZvmrsclN9dJvu2RynoCF2PwrZel57uEUOIlOAqch5pvyzEl8Qg4dhKdT9m+qkmt/P
Hg6Pb4eqT/dnhZCtZF7OtSNo3gH+KJtocmXlml4MUJseGs3FcqSNihmJ3gC9hwgSYItg
tbTzuytg2pbd9qyhn5e2YVKQtm6KuHBfxzC8XxyGLiEhdIgNw7aOswulGfFlGD5Tz9qw
r9Qg==
X-Gm-Message-State: AOJu0YxXPXuOE0Ktt55g9pkyWYrAvqgS2yvClraj9OkbU+MFXBTJ7eJH
+KzjSGLzpatomeuMytjHwj4AciijSxJRGoKfP2q6jJO+AguTJ9QP6/u+tNdpkdP1c0yZJBj0boD
OTqr8cUEVc+TWGf52zNVGMvjOTuBjoIs0nsCVQ9zWpP52YqWd7UrJY2RinQgytL9WPsfnirKQqp
2KqiMXwpAClind6OeZnk4D9Qtijw/1kb2gchXKBuOEGiGMap/NhHjbOw==
X-Gm-Gg: ASbGnctWUxTCDNA1H/8Lp7yyNbyuEpC6ZB6x8rgBBe7tuhAnKB2RgjtZZpWu14Fue/K
60vDRq/DCoz230XnYXsK7SToTaCAezGhB9YBzLCyqndpAZ293/U7DyN4o5s+L+f3/LMCRu8a4Io
cPuz8NBxsVhI2OwQxt7mlwgzVBwHZX1rapJ/CvtMFFPZiXVzQbUibtS8luPbj5jgwg79rntEsED
Ql53tAOeDYX3CNb/NNP4SgpaS+xZ6bKr/hqsSQsMhOAKffYM43RzUzf953TpsLxfwpno+I/7WH1
V2gCC/SnEhqT8ogUWc8CMdOaWK5Z7eyT472a/ncq+dukqus/MKdOavUisyN30JNF2/PzTm+u7+o
qoFDQgim6
X-Google-Smtp-Source: AGHT+IE9Q32HDotQZCozgKfWWXwly9cAwrWrmuvE9LG/4DExUoR6ZNVBNZy9hwWmB3Jho3Defm29Bw==
X-Received: by 2002:a17:907:d8e:b0:aca:95ee:ebed with SMTP id
a640c23a62f3a-acac005616cmr156399766b.7.1744275821613;
Thu, 10 Apr 2025 02:03:41 -0700 (PDT)
Received: from smtpclient.apple (tensor.andric.com. [87.251.56.140])
by smtp.gmail.com with ESMTPSA id
a640c23a62f3a-acaa1cb4373sm238163166b.92.2025.04.10.02.03.40
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Thu, 10 Apr 2025 02:03:40 -0700 (PDT)
From: Dimitry Andric <dimitry@unified-streaming.com>
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.10\))
Date: Thu, 10 Apr 2025 11:03:40 +0200
References: <20250403200239.226898-1-dimitry@unified-streaming.com>
To: ffmpeg-devel@ffmpeg.org
In-Reply-To: <20250403200239.226898-1-dimitry@unified-streaming.com>
Message-Id: <9ADA5613-0335-455A-B75C-8ADD42D860E6@unified-streaming.com>
X-Mailer: Apple Mail (2.3731.700.6.1.10)
Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov: Fix decoding fragmented
MP4 with multiple sample entries and empty stsc
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/9ADA5613-0335-455A-B75C-8ADD42D860E6@unified-streaming.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
On 3 Apr 2025, at 22:02, Dimitry Andric <dimitry@unified-streaming.com> wrote:
>
> When decoding fragmented MP4 files that have an empty stsc box, and
> instead contain sample description indexes in their tfhd boxes, the mov
> demuxer does not notify the decoder whenever the current sample
> description index changes. If the SPS or PPS changed sufficiently, this
> can lead to unexpected decoding errors.
>
> To fix this, in mov_finalize_packet(), when stsc_data is not available,
> use get_frag_stream_info_from_pkt() to get at the current fragment
> stream info, and retrieve the current sample description index from
> there. Then use that index in a similar manner as the stsc case.
>
> Signed-off-by: Dimitry Andric <dimitry@unified-streaming.com>
> ---
> libavformat/mov.c | 50 ++++++++++++++++++++++++++++-------------------
> 1 file changed, 30 insertions(+), 20 deletions(-)
>
> diff --git a/libavformat/mov.c b/libavformat/mov.c
> index 452690090c..ead89192f4 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c
> @@ -10756,25 +10756,29 @@ static int mov_switch_root(AVFormatContext *s, int64_t target, int index)
> return 1;
> }
>
> -static int mov_change_extradata(AVStream *st, AVPacket *pkt)
> +static int mov_change_extradata(AVStream *st, AVPacket *pkt, int stsd_id)
> {
> MOVStreamContext *sc = st->priv_data;
> uint8_t *side, *extradata;
> int extradata_size;
>
> - /* Save the current index. */
> - sc->last_stsd_index = sc->stsc_data[sc->stsc_index].id - 1;
> + if (stsd_id > 0 &&
> + stsd_id - 1 < sc->stsd_count &&
> + stsd_id - 1 != sc->last_stsd_index) {
> + /* Save the current index. */
> + sc->last_stsd_index = stsd_id - 1;
>
> - /* Notify the decoder that extradata changed. */
> - extradata_size = sc->extradata_size[sc->last_stsd_index];
> - extradata = sc->extradata[sc->last_stsd_index];
> - if (st->discard != AVDISCARD_ALL && extradata_size > 0 && extradata) {
> - side = av_packet_new_side_data(pkt,
> - AV_PKT_DATA_NEW_EXTRADATA,
> - extradata_size);
> - if (!side)
> - return AVERROR(ENOMEM);
> - memcpy(side, extradata, extradata_size);
> + /* Notify the decoder that extradata changed. */
> + extradata_size = sc->extradata_size[sc->last_stsd_index];
> + extradata = sc->extradata[sc->last_stsd_index];
> + if (st->discard != AVDISCARD_ALL && extradata_size > 0 && extradata) {
> + side = av_packet_new_side_data(pkt,
> + AV_PKT_DATA_NEW_EXTRADATA,
> + extradata_size);
> + if (!side)
> + return AVERROR(ENOMEM);
> + memcpy(side, extradata, extradata_size);
> + }
> }
>
> return 0;
> @@ -10893,13 +10897,10 @@ static int mov_finalize_packet(AVFormatContext *s, AVStream *st, AVIndexEntry *s
>
> /* Multiple stsd handling. */
> if (sc->stsc_data) {
> - if (sc->stsc_data[sc->stsc_index].id > 0 &&
> - sc->stsc_data[sc->stsc_index].id - 1 < sc->stsd_count &&
> - sc->stsc_data[sc->stsc_index].id - 1 != sc->last_stsd_index) {
> - int ret = mov_change_extradata(st, pkt);
> - if (ret < 0)
> - return ret;
> - }
> + int stsd_id = sc->stsc_data[sc->stsc_index].id;
> + int ret = mov_change_extradata(st, pkt, stsd_id);
> + if (ret < 0)
> + return ret;
>
> /* Update the stsc index for the next sample */
> sc->stsc_sample++;
> @@ -10908,6 +10909,15 @@ static int mov_finalize_packet(AVFormatContext *s, AVStream *st, AVIndexEntry *s
> sc->stsc_index++;
> sc->stsc_sample = 0;
> }
> + } else {
> + MOVContext *mov = s->priv_data;
> + MOVFragmentStreamInfo *frag_stream_info = get_frag_stream_info_from_pkt(&mov->frag_index, pkt, sc->id);
> + if (frag_stream_info) {
> + int stsd_id = frag_stream_info->stsd_id;
> + int ret = mov_change_extradata(st, pkt, stsd_id);
> + if (ret < 0)
> + return ret;
> + }
> }
>
> return 0;
> --
> 2.43.0
>
Any comments on this patch?
-Dimitry
_______________________________________________
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".