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 878C64E11E
for <ffmpegdev@gitmailbox.com>; Mon, 28 Apr 2025 11:00:31 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D89068AD09;
Mon, 28 Apr 2025 14:00:27 +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 818D4687D4F
for <ffmpeg-devel@ffmpeg.org>; Mon, 28 Apr 2025 14:00:20 +0300 (EEST)
Received: by mail-ej1-f45.google.com with SMTP id
a640c23a62f3a-ace333d5f7bso744314866b.3
for <ffmpeg-devel@ffmpeg.org>; Mon, 28 Apr 2025 04:00:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=unified-streaming.com; s=google; t=1745838020; x=1746442820; 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=ilJJZb9HBG4DxwmWemFtVSOzHXQMqQc5p2NlG/d4iKU=;
b=P1B3JWlFFxzvRMM8gEYf8e/QZfupdzyv1OwLpl5ig0/VxgA/pnzyGgoP1UHCXcaBl2
AZasC15NP7HrbNclXGTWgq0m25OMyRVh0AVlmugUMyg82rvKwpchIp8RMS5eZRMz+Bzk
u8PlgOxMkzUujP8TfGEA4tflSH2EaC0yKrJSzCScyM6UaIzTGRjSToPP2KPqJRsH2hCU
gHhbiPedTiAxtRyx/OvHUKJVrs55wdVz7nZ4xNhGsvBn8JimVKf6BH63oyHXc2H02RmV
HXFwFk3O5fAeCdheg5lkvmj62Jxp8HHwDOpXz1bF6+M6HWewHUSFf4rUenzl/Z32qnYD
uuXg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745838020; x=1746442820;
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=ilJJZb9HBG4DxwmWemFtVSOzHXQMqQc5p2NlG/d4iKU=;
b=e/nkFBgNp18cM5v64Cc7stoZ4MQfLrzW5KnASco0ddhlYYaOwvsaqgWUPM7ILcMZSz
19dtSOeGvy5pXQXM65HM38l/c+OaRQxrekXRzq8Sh8LMTjWIuSpEz31ilvITb0pfY7Px
P4qh32MWzoqpMDGgdXjduR1BOZVSUPFAy5NXQuS73vRc9OmS/iMMTBUf87o8baBqZPq3
3/WlDsZPoC1f+sUj8ZvITdtUeuDWOe1GR41iHxo3+UOpi6RSMmwkwtFNVz59CIBsBPjr
KQa8Q25xYK5sZy77aWn6Su8Nohj25fYttRHlWjyewSq8AVrtLYiqdH7XNEkpTHTLePJV
0Jxw==
X-Gm-Message-State: AOJu0YyPdi90EB67F+Mi9dbDYM8EI5XOdjGCezea+rVvmx74Jjm3IGsC
XbqxEQqgnBMcQDuM06MmIybDmhSgkNEGbIvXxOAuSjb34AfzoccXOJnWJWbLGj8NkY+FW2DqjSB
XMK9gOALi4Un/8fNuDVpRyW3joVIcK2Egb+LjZuwUBL+fZK6VOA45vUULUvZZgPm2+QlUG+McgX
dZxUESbRdAQdr4a3Rp8hri8Yt81IA6rFb7N90AirEiBKnM/0jpoH9A4w==
X-Gm-Gg: ASbGncsYyMTfVKo8psryB8kmjBtYfP3Em0eGwJyjUHSCxn5aSYnt4cI5p/wJmN8/vga
YPSHXWXLUyWfa3GFAbIQOosn3i5MTLjr4zSWpaMiH8csvfirkrxqbBSwrgaGQ+0cOf0WrGnYuHk
5HqTN1/GSe3f9JRx0ZL6UBROJLuQyZUpUWXQ+D5on/Qa1tg7k/o1eXCAZaLcY8OF78ad3KPfrfZ
qxCABcgzJ4M7rpuGcOOvV321kUb78G2231hjlwsu6oeWSushdcKWDxYVUmp7kmC+34qebVWb3LF
vbKFaZ6JqEfi/Kw0/DJkEDpTld8aRf5oB5QiPSYmIEpDo1IhXXA/SWhzWItrn9j0a14TFreNSE7
Ipz2hSsFYTFV3PijAGjs=
X-Google-Smtp-Source: AGHT+IE0zE3B5m4GS3jckwqC/KCTM8Pop3im8k/1H0TVzGVG+AJOP/RfLi8+un19DV6HISubTUBJ5w==
X-Received: by 2002:a17:906:dff6:b0:ace:bead:5ee6 with SMTP id
a640c23a62f3a-acebead72famr30497466b.37.1745838019253;
Mon, 28 Apr 2025 04:00:19 -0700 (PDT)
Received: from smtpclient.apple (tensor.andric.com. [87.251.56.140])
by smtp.gmail.com with ESMTPSA id
a640c23a62f3a-ace6e4e72c8sm615135366b.54.2025.04.28.04.00.18
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Mon, 28 Apr 2025 04:00:18 -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: Mon, 28 Apr 2025 13:00:18 +0200
References: <20250403200239.226898-1-dimitry@unified-streaming.com>
<9ADA5613-0335-455A-B75C-8ADD42D860E6@unified-streaming.com>
<039BFB64-4F2B-4644-BA12-AE7ECE262393@unified-streaming.com>
To: ffmpeg-devel@ffmpeg.org
In-Reply-To: <039BFB64-4F2B-4644-BA12-AE7ECE262393@unified-streaming.com>
Message-Id: <4ECBE413-6C97-473E-A61F-75DCD6281196@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/4ECBE413-6C97-473E-A61F-75DCD6281196@unified-streaming.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
On 19 Apr 2025, at 16:27, Dimitry Andric <dimitry@unified-streaming.com> wrote:
>
> On 10 Apr 2025, at 11:03, Dimitry Andric <dimitry@unified-streaming.com> wrote:
>>
>> 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?
>
> Ping :)
Is there any particular group of persons that "own" the mov muxer?
-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".