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 E0B604C36F
for <ffmpegdev@gitmailbox.com>; Thu, 3 Apr 2025 20:02:50 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAA7A68B61D;
Thu, 3 Apr 2025 23:02:45 +0300 (EEST)
Received: from tensor.andric.com (tensor.andric.com [87.251.56.140])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B81AB68AE7C
for <ffmpeg-devel@ffmpeg.org>; Thu, 3 Apr 2025 23:02:39 +0300 (EEST)
Received: from dalmore.home.andric.com (dalmore.home.andric.com [192.168.0.19])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by tensor.andric.com (Postfix) with ESMTPS id 51429629F4;
Thu, 03 Apr 2025 22:02:39 +0200 (CEST)
From: Dimitry Andric <dimitry@unified-streaming.com>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 3 Apr 2025 22:02:39 +0200
Message-ID: <20250403200239.226898-1-dimitry@unified-streaming.com>
X-Mailer: git-send-email 2.43.0
MIME-Version: 1.0
Subject: [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>
Cc: Dimitry Andric <dimitry@unified-streaming.com>
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/20250403200239.226898-1-dimitry@unified-streaming.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
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
_______________________________________________
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".