From: Erkki Seppälä <erkki.seppala....@nokia.com>
This can be useful in particular with timed meta data tracks related
to multiple tracks.
Signed-off-by: Erkki Seppälä <erkki.seppala....@nokia.com>
Signed-off-by: OZOPlayer <oz...@nokia.com>
---
libavformat/isom.h | 3 +++
libavformat/mov.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 49c8996..9ad898a 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -168,6 +168,9 @@ typedef struct MOVStreamContext {
int start_pad; ///< amount of samples to skip due to enc-dec delay
unsigned int rap_group_count;
MOVSbgp *rap_group;
+ uint32_t tref_tag;
+ int nb_tref_ids;
+ int *tref_ids; ///< trackIDs of the referenced tracks
int nb_frames_for_fps;
int64_t duration_for_fps;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1bc3800..9cd915d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3157,6 +3157,48 @@ static void fix_timescale(MOVContext *c,
MOVStreamContext *sc)
}
}
+static int mov_read_tref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+{
+ uint32_t size = avio_rb32(pb);
+ AVStream *st;
+ MOVStreamContext *sc;
+ int ret;
+
+ if (c->fc->nb_streams < 1)
+ return 0;
+
+ st = c->fc->streams[c->fc->nb_streams-1];
+ sc = st->priv_data;
+
+ if (size < 12 || size > atom.size) {
+ avio_seek(pb, -4, SEEK_CUR);
+ return mov_read_default(c, pb, atom);
+ } else {
+ int remaining = size - 4;
+
+ if (remaining % 4 != 0)
+ return AVERROR_INVALIDDATA;
+
+ /* an arbitrary upper limit to prevent wasting all memory to this */
+ if (remaining > 4 * 256)
+ remaining = 4 * 256;
+
+ ret = av_reallocp_array(&sc->tref_ids, remaining / 4,
sizeof(*sc->tref_ids));
+ if (ret != 0)
+ return ret;
+
+ sc->tref_tag = avio_rl32(pb);
+ remaining -= 4;
+ while (remaining > 0) {
+ sc->tref_ids[sc->nb_tref_ids] = avio_rb32(pb);
+ sc->nb_tref_ids++;
+ remaining -= 4;
+ }
+ avio_seek(pb, remaining, SEEK_CUR);
+ return ret;
+ }
+}
+
static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
AVStream *st;
@@ -4414,7 +4456,7 @@ static const MOVParseTableEntry mov_default_parse_table[]
= {
{ MKTAG('t','f','h','d'), mov_read_tfhd }, /* track fragment header */
{ MKTAG('t','r','a','k'), mov_read_trak },
{ MKTAG('t','r','a','f'), mov_read_default },
-{ MKTAG('t','r','e','f'), mov_read_default },
+{ MKTAG('t','r','e','f'), mov_read_tref },
{ MKTAG('t','m','c','d'), mov_read_tmcd },
{ MKTAG('c','h','a','p'), mov_read_chap },
{ MKTAG('t','r','e','x'), mov_read_trex },
@@ -4832,6 +4874,8 @@ static int mov_read_close(AVFormatContext *s)
av_freep(&sc->cenc.auxiliary_info);
av_freep(&sc->cenc.auxiliary_info_sizes);
av_aes_ctr_free(sc->cenc.aes_ctr);
+
+ av_freep(&sc->tref_ids);
}
if (mov->dv_demux) {
--
2.7.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
