Mercurial > libavformat.hg

changeset 5044:2ef633b32f7a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for muxing XSUB subtitles to AVI muxer.
author reimar
date Fri, 19 Jun 2009 13:26:10 +0000
parents 3e581a9edb36
children 9ed3c88ed9ba
files avienc.c
diffstat 1 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/avienc.c	Thu Jun 18 19:31:12 2009 +0000
+++ b/avienc.c	Fri Jun 19 13:26:10 2009 +0000
@@ -81,6 +81,10 @@
     if (type == CODEC_TYPE_VIDEO) {
         tag[2] = 'd';
         tag[3] = 'c';
+    } else if (type == CODEC_TYPE_SUBTITLE) {
+        // note: this is not an official code
+        tag[2] = 's';
+        tag[3] = 'b';
     } else {
         tag[2] = 'w';
         tag[3] = 'b';
@@ -208,12 +212,17 @@
         /* stream generic header */
         strh = start_tag(pb, "strh");
         switch(stream->codec_type) {
+        case CODEC_TYPE_SUBTITLE:
+            // XSUB subtitles behave like video tracks, other subtitles
+            // are not (yet) supported.
+            if (stream->codec_id != CODEC_ID_XSUB) break;
         case CODEC_TYPE_VIDEO: put_tag(pb, "vids"); break;
         case CODEC_TYPE_AUDIO: put_tag(pb, "auds"); break;
 //        case CODEC_TYPE_TEXT : put_tag(pb, "txts"); break;
         case CODEC_TYPE_DATA : put_tag(pb, "dats"); break;
         }
-        if(stream->codec_type == CODEC_TYPE_VIDEO)
+        if(stream->codec_type == CODEC_TYPE_VIDEO ||
+           stream->codec_id == CODEC_ID_XSUB)
             put_le32(pb, stream->codec_tag);
         else
             put_le32(pb, 1);
@@ -252,6 +261,10 @@
       if(stream->codec_type != CODEC_TYPE_DATA){
         strf = start_tag(pb, "strf");
         switch(stream->codec_type) {
+        case CODEC_TYPE_SUBTITLE:
+            // XSUB subtitles behave like video tracks, other subtitles
+            // are not (yet) supported.
+            if (stream->codec_id != CODEC_ID_XSUB) break;
         case CODEC_TYPE_VIDEO:
             put_bmp_header(pb, stream, codec_bmp_tags, 0);
             break;