virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Add support for muxing XSUB subtitles to AVI muxer.

Browse Source 
Originally committed as revision 19223 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-06-19 13:26:10 +00:00
parent a4276ba2ac
commit 2a04d6e772
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/avienc.c
View File

@ -81,6 +81,10 @@ static char* avi_stream2fourcc(char* tag, int index, enum CodecType type)
if (type == CODEC_TYPE_VIDEO) { if (type == CODEC_TYPE_VIDEO) {
tag[2] = 'd'; tag[2] = 'd';
tag[3] = 'c'; tag[3] = 'c';
} else if (type == CODEC_TYPE_SUBTITLE) {
// note: this is not an official code
tag[2] = 's';
tag[3] = 'b';
} else { } else {
tag[2] = 'w'; tag[2] = 'w';
tag[3] = 'b'; tag[3] = 'b';
@ -208,12 +212,17 @@ static int avi_write_header(AVFormatContext *s)
/* stream generic header */ /* stream generic header */
strh = start_tag(pb, "strh"); strh = start_tag(pb, "strh");
switch(stream->codec_type) { 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_VIDEO: put_tag(pb, "vids"); break;
case CODEC_TYPE_AUDIO: put_tag(pb, "auds"); break; case CODEC_TYPE_AUDIO: put_tag(pb, "auds"); break;
// case CODEC_TYPE_TEXT : put_tag(pb, "txts"); break; // case CODEC_TYPE_TEXT : put_tag(pb, "txts"); break;
case CODEC_TYPE_DATA : put_tag(pb, "dats"); 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); put_le32(pb, stream->codec_tag);
else else
put_le32(pb, 1); put_le32(pb, 1);
@ -252,6 +261,10 @@ static int avi_write_header(AVFormatContext *s)
if(stream->codec_type != CODEC_TYPE_DATA){ if(stream->codec_type != CODEC_TYPE_DATA){
strf = start_tag(pb, "strf"); strf = start_tag(pb, "strf");
switch(stream->codec_type) { 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: case CODEC_TYPE_VIDEO:
put_bmp_header(pb, stream, codec_bmp_tags, 0); put_bmp_header(pb, stream, codec_bmp_tags, 0);
break; break;