Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 1/2] avformat/mov: ensure the IAMF track is the first
@ 2024-08-01  2:14 James Almer
  2024-08-01  2:14 ` [FFmpeg-devel] [PATCH 2/2] fate/mov: add an IAMF+video muxing test James Almer
  2024-08-01  8:59 ` [FFmpeg-devel] [PATCH 1/2] avformat/mov: ensure the IAMF track is the first Anton Khirnov
  0 siblings, 2 replies; 5+ messages in thread
From: James Almer @ 2024-08-01  2:14 UTC (permalink / raw)
  To: ffmpeg-devel

Fixes crashes when muxing video tracks alongside IAMF ones.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/movenc.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index ae49582a1a..87ec368d52 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -7536,6 +7536,7 @@ static int mov_init_iamf_track(AVFormatContext *s)
     if (!track->iamf)
         return AVERROR(ENOMEM);
 
+    track->first_iamf_idx = INT_MAX;
     for (int i = 0; i < s->nb_stream_groups; i++) {
         const AVStreamGroup *stg = s->stream_groups[i];
         switch(stg->type) {
@@ -7558,6 +7559,11 @@ static int mov_init_iamf_track(AVFormatContext *s)
             return ret;
     }
 
+    if (track->first_iamf_idx != 0) {
+        av_log(s, AV_LOG_ERROR, "The IMAF track must be the first track\n");
+        return AVERROR(EINVAL);;
+    }
+
     track->tag = MKTAG('i','a','m','f');
 
     ret = avio_open_dyn_buf(&track->iamf_buf);
@@ -7830,8 +7836,11 @@ static int mov_init(AVFormatContext *s)
     for (int j = 0, i = 0; j < s->nb_streams; j++) {
         AVStream *st = s->streams[j];
 
-        if (st != st->priv_data)
+        if (st != st->priv_data) {
+            if (!i)
+                i++; // IAMF track is the first one
             continue;
+        }
         st->priv_data = &mov->tracks[i++];
     }
 
-- 
2.45.2

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-08-01 15:06 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-01  2:14 [FFmpeg-devel] [PATCH 1/2] avformat/mov: ensure the IAMF track is the first James Almer
2024-08-01  2:14 ` [FFmpeg-devel] [PATCH 2/2] fate/mov: add an IAMF+video muxing test James Almer
2024-08-01  8:59 ` [FFmpeg-devel] [PATCH 1/2] avformat/mov: ensure the IAMF track is the first Anton Khirnov
2024-08-01 12:35   ` James Almer
2024-08-01 15:07     ` James Almer

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