Set keyframe flags based on this atom, too.
This atom contains info about which samples are keyframes in
some files where it isn't indicated in any other way. (Smooth
streaming fragments produced by Wowza and ismv files produced
by Sorenson Squeeze don't indicate any difference at all between
keyframes and nonkeyframes via sample flags.)
---
Updated the subject line, added defines for the bitfields.
libavformat/isom.h | 11 +++++++++++
libavformat/mov.c | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 32c4b3f..fd457fa 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -77,6 +77,7 @@ typedef struct {
unsigned duration;
unsigned size;
unsigned flags;
+ unsigned trun_entries;
} MOVFragment;
typedef struct {
@@ -181,6 +182,16 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id);
#define MOV_FRAG_SAMPLE_FLAG_DEPENDS_NO 0x02000000
#define MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES 0x01000000
+#define MOV_SDTP_DEPENDS_MASK 0x30
+#define MOV_SDTP_DEPENDS_YES 0x10
+#define MOV_SDTP_DEPENDS_NO 0x20
+#define MOV_SDTP_DEPENDED_MASK 0x0c
+#define MOV_SDTP_DEPENDED_NO 0x04
+#define MOV_SDTP_DEPENDED_YES 0x08
+#define MOV_SDTP_REDUNDANCY_MASK 0x03
+#define MOV_SDTP_REDUNDANCY_YES 0x01
+#define MOV_SDTP_REDUNDANCY_NO 0x02
+
int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom);
enum CodecID ff_mov_get_lpcm_codec_id(int bps, int flags);
diff --git a/libavformat/mov.c b/libavformat/mov.c
index fbc7223..c9e400e 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2177,6 +2177,7 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
avio_rb32(pb) : trex->size;
frag->flags = flags & MOV_TFHD_DEFAULT_FLAGS ?
avio_rb32(pb) : trex->flags;
+ frag->trun_entries = 0;
av_dlog(c->fc, "frag flags 0x%x\n", frag->flags);
return 0;
}
@@ -2295,10 +2296,46 @@ static int mov_read_trun(MOVContext *c, AVIOContext
*pb, MOVAtom atom)
sc->data_size += sample_size;
}
frag->moof_offset = offset;
+ frag->trun_entries = entries;
st->duration = sc->track_end = dts + sc->time_offset;
return 0;
}
+static int mov_read_sdtp(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+{
+ MOVFragment *frag = &c->fragment;
+ AVStream *st = NULL;
+ int i;
+
+ /* This seems to be used in ismv files, where the entries normally are
+ * 0x28 for audio samples, 0x24 for video keyframes and 0x14 for video
+ * nonkeyframes. For some ismv files, this is the only way of identifying
+ * keyframes.
+ */
+
+ for (i = 0; i < c->fc->nb_streams && !st; i++)
+ if (c->fc->streams[i]->id == frag->track_id)
+ st = c->fc->streams[i];
+ if (!st) {
+ av_log(c->fc, AV_LOG_ERROR,
+ "could not find corresponding track id %d\n", frag->track_id);
+ return AVERROR_INVALIDDATA;
+ }
+ avio_r8(pb); /* version */
+ avio_rb24(pb); /* flags */
+
+ if (frag->trun_entries == atom.size - 4 &&
+ st->nb_index_entries >= frag->trun_entries) {
+ for (i = 0; i < frag->trun_entries; i++) {
+ int entry = st->nb_index_entries - frag->trun_entries + i;
+ AVIndexEntry *ie = &st->index_entries[entry];
+ if (avio_r8(pb) & MOV_SDTP_DEPENDS_NO)
+ ie->flags |= AVINDEX_KEYFRAME;
+ }
+ }
+ return 0;
+}
+
/* this atom should be null (from specs), but some buggy files put the 'moov'
atom inside it... */
/* like the files created with Adobe Premiere 5.0, for samples see */
/* http://graphics.tudelft.nl/~wouter/publications/soundtests/ */
@@ -2458,6 +2495,7 @@ static const MOVParseTableEntry mov_default_parse_table[]
= {
{ MKTAG('c','h','a','p'), mov_read_chap },
{ MKTAG('t','r','e','x'), mov_read_trex },
{ MKTAG('t','r','u','n'), mov_read_trun },
+{ MKTAG('s','d','t','p'), mov_read_sdtp },
{ MKTAG('u','d','t','a'), mov_read_default },
{ MKTAG('w','a','v','e'), mov_read_wave },
{ MKTAG('e','s','d','s'), mov_read_esds },
--
1.7.3.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
