projects / ffmpeg.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 415c801)
avformat/mov: fix cases where we discard iamf packets from enabled streams release/8.0
authorJames Almer <jamrial@gmail.com>
Fri, 27 Feb 2026 13:41:31 +0000 (10:41 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 27 Feb 2026 15:27:15 +0000 (12:27 -0300)
Given the entire iamf struct is inside a single Track, if the first iamf stream
(which is the one sharing the index and id from the Track) was to be disabled,
then packets from every iamf stream would be discarded.
Fix this by actually going through the entire iamf Sample and discarding those
from the disabled streams only.

Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 16ee3d8d99a2f2e83a2559e958e19ede813b29f8)

libavformat/iamf_reader.c patch | blob | history
libavformat/mov.c patch | blob | history
libavformat/version.h patch | blob | history

diff --git a/libavformat/iamf_reader.c b/libavformat/iamf_reader.c
index f7abdf42076f8391bb67de1716509ef227f24a23..2098f264aafcf069c63a4405b353a96a8612cd95 100644 (file)
--- a/libavformat/iamf_reader.c
+++ b/libavformat/iamf_reader.c
@@ -95,6 +95,9 @@ static int audio_frame_obu(AVFormatContext *s, const IAMFDemuxContext *c,
         memcpy(side_data, c->recon, c->recon_size);
     }
 
+    if (st->discard == AVDISCARD_ALL)
+        pkt->flags |= AV_PKT_FLAG_DISCARD;
+
     pkt->stream_index = st->index;
     return 0;
 }
diff --git a/libavformat/mov.c b/libavformat/mov.c
index d722fc3deb6fc22b6de339e5376ec5c432f9314e..49498eda77f4454874a350e07ae773d6fd38e7ef 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -11153,7 +11153,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
         sample->size = FFMIN(sample->size, (mov->next_root_atom - sample->pos));
     }
 
-    if (st->discard != AVDISCARD_ALL) {
+    if (st->discard != AVDISCARD_ALL || sc->iamf) {
         int64_t ret64 = avio_seek(sc->pb, sample->pos, SEEK_SET);
         if (ret64 != sample->pos) {
             av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
@@ -11189,6 +11189,12 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
                     return ret;
                 }
                 size -= ret;
+
+                if (pkt->flags & AV_PKT_FLAG_DISCARD) {
+                    av_packet_unref(pkt);
+                    ret = 0;
+                    continue;
+                }
                 pkt->pts = pts; pkt->dts = dts;
                 pkt->pos = pos; pkt->flags |= flags;
                 pkt->duration = duration;
diff --git a/libavformat/version.h b/libavformat/version.h
index 7ff14839125f8f80263f1087d205438c385dfc8e..ee9199036027e84ffeaffc110b8f248e48e69d1b 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@
 #include "version_major.h"
 
 #define LIBAVFORMAT_VERSION_MINOR   3
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \
FFmpeg git repo