[FFmpeg-cvslog] mov: honor tmcd flags while extracting timecode meta.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement.boesch at smartjog.com> | Tue Jan 31 10:52:47 2012 +0100| [77971609dec16882d2df52328db561a2dc3e591e] | committer: Clément Bœsch

mov: honor tmcd flags while extracting timecode meta.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77971609dec16882d2df52328db561a2dc3e591e
---

 libavformat/isom.h |    1 +
 libavformat/mov.c  |   12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libavformat/isom.h b/libavformat/isom.h
index da2b74a..40455e5 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -128,6 +128,7 @@ typedef struct MOVStreamContext {
     uint32_t palette[256];
     int has_palette;
     int64_t data_size;
+    uint32_t tmcd_flags;  ///< tmcd track flags
 } MOVStreamContext;
 
 typedef struct MOVContext {
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6755152..e345355 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1381,9 +1381,11 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
             st->codec->height = sc->height;
         } else {
             if (st->codec->codec_tag == MKTAG('t','m','c','d')) {
+                MOVStreamContext *tmcd_ctx = st->priv_data;
                 int val;
                 avio_rb32(pb);       /* reserved */
                 val = avio_rb32(pb); /* flags */
+                tmcd_ctx->tmcd_flags = val;
                 if (val & 1)
                     st->codec->flags2 |= CODEC_FLAG2_DROP_FRAME_TIMECODE;
                 avio_rb32(pb); /* time scale */
@@ -2654,13 +2656,12 @@ finish:
 }
 
 static int parse_timecode_in_framenum_format(AVFormatContext *s, AVStream *st,
-                                             uint32_t value)
+                                             uint32_t value, int flags)
 {
     AVTimecode tc;
     char buf[AV_TIMECODE_STR_SIZE];
     AVRational rate = {st->codec->time_base.den,
                        st->codec->time_base.num};
-    int flags = st->codec->flags2 & CODEC_FLAG2_DROP_FRAME_TIMECODE ? AV_TIMECODE_FLAG_DROPFRAME : 0;
     int ret = av_timecode_init(&tc, rate, flags, 0, s);
     if (ret < 0)
         return ret;
@@ -2672,6 +2673,7 @@ static int parse_timecode_in_framenum_format(AVFormatContext *s, AVStream *st,
 static int mov_read_timecode_track(AVFormatContext *s, AVStream *st)
 {
     MOVStreamContext *sc = st->priv_data;
+    int flags = 0;
     int64_t cur_pos = avio_tell(sc->pb);
     uint32_t value;
 
@@ -2681,12 +2683,16 @@ static int mov_read_timecode_track(AVFormatContext *s, AVStream *st)
     avio_seek(sc->pb, st->index_entries->pos, SEEK_SET);
     value = avio_rb32(s->pb);
 
+    if (sc->tmcd_flags & 0x0001) flags |= AV_TIMECODE_FLAG_DROPFRAME;
+    if (sc->tmcd_flags & 0x0002) flags |= AV_TIMECODE_FLAG_24HOURSMAX;
+    if (sc->tmcd_flags & 0x0004) flags |= AV_TIMECODE_FLAG_ALLOWNEGATIVE;
+
     /* Assume Counter flag is set to 1 in tmcd track (even though it is likely
      * not the case) and thus assume "frame number format" instead of QT one.
      * No sample with tmcd track can be found with a QT timecode at the moment,
      * despite what the tmcd track "suggests" (Counter flag set to 0 means QT
      * format). */
-    parse_timecode_in_framenum_format(s, st, value);
+    parse_timecode_in_framenum_format(s, st, value, flags);
 
     avio_seek(sc->pb, cur_pos, SEEK_SET);
     return 0;