[FFmpeg-devel] [PATCH] write reel_name metadata to tmcd atom

Mark Reid mindmark at gmail.com
Fri Aug 8 19:37:06 CEST 2014


---
 libavformat/movenc.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 86dbe7f..fe4413c 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1340,6 +1340,16 @@ static int mov_write_rtp_tag(AVIOContext *pb, MOVTrack *track)
     return update_size(pb, pos);
 }
 
+static int mov_write_source_reference_tag(AVIOContext *pb, MOVTrack *track, const char *reel_name){
+    int64_t pos = avio_tell(pb);
+    avio_wb32(pb, 0);                              /* size */
+    ffio_wfourcc(pb, "name");                      /* Data format */
+    avio_wb16(pb, strlen(reel_name));              /* string size */
+    avio_wb16(pb, track->language);                /* langcode */
+    avio_write(pb, reel_name, strlen(reel_name));  /* reel name */
+    return update_size(pb,pos);
+}
+
 static int mov_write_tmcd_tag(AVIOContext *pb, MOVTrack *track)
 {
     int64_t pos = avio_tell(pb);
@@ -1361,8 +1371,16 @@ static int mov_write_tmcd_tag(AVIOContext *pb, MOVTrack *track)
     avio_wb32(pb, track->timescale);        /* Timescale */
     avio_wb32(pb, frame_duration);          /* Frame duration */
     avio_w8(pb, nb_frames);                 /* Number of frames */
-    avio_wb24(pb, 0);                       /* Reserved */
-    /* TODO: source reference string */
+    avio_w8(pb, 0);                         /* Reserved */
+    
+    AVDictionaryEntry *t = NULL;
+    if (track->st)
+        t = av_dict_get(track->st->metadata, "reel_name", NULL, 0);
+    
+    if (t && utf8len(t->value))
+        mov_write_source_reference_tag(pb, track, t->value);
+    else
+        avio_wb16(pb, 0); /* zero size */
 #else
 
     avio_wb32(pb, 0); /* size */
@@ -3808,6 +3826,9 @@ static int mov_create_timecode_track(AVFormatContext *s, int index, int src_inde
     track->timescale = mov->tracks[src_index].timescale;
     if (tc.flags & AV_TIMECODE_FLAG_DROPFRAME)
         track->timecode_flags |= MOV_TIMECODE_FLAG_DROPFRAME;
+    
+    /* set st to src_st for metadata access*/
+    track->st = src_st;
 
     /* encode context: tmcd data stream */
     track->enc = avcodec_alloc_context3(NULL);
-- 
2.0.0



More information about the ffmpeg-devel mailing list