libavformat.hg: movenc.c comparison

comparison movenc.c @ 4193:2d3be324c648 libavformat

Add support for muxing mov/mp4/3gp timed text streams

author	conrad
date	Sun, 11 Jan 2009 10:26:44 +0000
parents	82cbec030af5
children	67ab85a3611d

comparison

equal deleted inserted replaced

-:a48a6a414dfe
+:2d3be324c648
 { CODEC_ID_H264,   MKTAG('a','v','c','1') },
 { CODEC_ID_MPEG4,  MKTAG('m','p','4','v') },
 { CODEC_ID_AAC,    MKTAG('m','p','4','a') },
 { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') },
 { CODEC_ID_AMR_WB, MKTAG('s','a','w','b') },
+{ CODEC_ID_MOV_TEXT, MKTAG('t', 'x', '3', 'g') },
 { CODEC_ID_NONE, 0 },
 };
 static const AVCodecTag mov_pix_fmt_tags[] = {
 { PIX_FMT_YUYV422, MKTAG('y','u','v','s') },
 { CODEC_ID_H264,   MKTAG('a','v','c','1') },
 { CODEC_ID_MPEG4,  MKTAG('m','p','4','v') },
 { CODEC_ID_AAC,    MKTAG('m','p','4','a') },
 { CODEC_ID_ALAC,   MKTAG('a','l','a','c') },
 { CODEC_ID_AC3,    MKTAG('a','c','-','3') },
+{ CODEC_ID_MOV_TEXT, MKTAG('t', 'x', '3', 'g') },
 { CODEC_ID_NONE, 0 },
 };
 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
 {
 if (!codec_get_tag(ff_mp4_obj_type, track->enc->codec_id))
 return 0;
 if      (track->enc->codec_id == CODEC_ID_H264)      tag = MKTAG('a','v','c','1');
 else if (track->enc->codec_id == CODEC_ID_AC3)       tag = MKTAG('a','c','-','3');
 else if (track->enc->codec_id == CODEC_ID_DIRAC)     tag = MKTAG('d','r','a','c');
+else if (track->enc->codec_id == CODEC_ID_MOV_TEXT)  tag = MKTAG('t','x','3','g');
 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
 } else if (track->mode == MODE_IPOD) {
 tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id);
 if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v"))
 tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff));
 av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, "
 "the file may be unplayable!\n");
 }
 }
+} else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
+tag = codec_get_tag(ff_codec_movsubtitle_tags, track->enc->codec_id);
 }
 }
 }
 return tag;
 }
 put_be32(pb, 0x5f244fc5);
 put_be32(pb, 0xba39a51b);
 put_be32(pb, 0xcf0323f3);
 put_be32(pb, 0x0);
 return 28;
+}
+static int mov_write_subtitle_tag(ByteIOContext *pb, MOVTrack *track)
+{
+int64_t pos = url_ftell(pb);
+put_be32(pb, 0);    /* size */
+put_le32(pb, track->tag); // store it byteswapped
+put_be32(pb, 0);    /* Reserved */
+put_be16(pb, 0);    /* Reserved */
+put_be16(pb, 1);    /* Data-reference index */
+if (track->enc->extradata_size)
+put_buffer(pb, track->enc->extradata, track->enc->extradata_size);
+return updateSize(pb, pos);
 }
 static int mov_write_video_tag(ByteIOContext *pb, MOVTrack *track)
 {
 int64_t pos = url_ftell(pb);
 put_be32(pb, 1); /* entry count */
 if (track->enc->codec_type == CODEC_TYPE_VIDEO)
 mov_write_video_tag(pb, track);
 else if (track->enc->codec_type == CODEC_TYPE_AUDIO)
 mov_write_audio_tag(pb, track);
+else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE)
+mov_write_subtitle_tag(pb, track);
 return updateSize(pb, pos);
 }
 static int mov_write_ctts_tag(ByteIOContext *pb, MOVTrack *track)
 {
 put_tag(pb, "dinf");
 mov_write_dref_tag(pb);
 return updateSize(pb, pos);
 }
+static int mov_write_nmhd_tag(ByteIOContext *pb)
+{
+put_be32(pb, 12);
+put_tag(pb, "nmhd");
+put_be32(pb, 0);
+return 12;
+}
+static int mov_write_gmhd_tag(ByteIOContext *pb)
+{
+put_be32(pb, 0x20);   /* size */
+put_tag(pb, "gmhd");
+put_be32(pb, 0x18);   /* gmin size */
+put_tag(pb, "gmin");  /* generic media info */
+put_be32(pb, 0);      /* version & flags */
+put_be16(pb, 0x40);   /* graphics mode = */
+put_be16(pb, 0x8000); /* opColor (r?) */
+put_be16(pb, 0x8000); /* opColor (g?) */
+put_be16(pb, 0x8000); /* opColor (b?) */
+put_be16(pb, 0);      /* balance */
+put_be16(pb, 0);      /* reserved */
+return 0x20;
+}
 static int mov_write_smhd_tag(ByteIOContext *pb)
 {
 put_be32(pb, 16); /* size */
 put_tag(pb, "smhd");
 put_be32(pb, 0); /* version & flags */
 } else {
 hdlr = (track->mode == MODE_MOV) ? "mhlr" : "\0\0\0\0";
 if (track->enc->codec_type == CODEC_TYPE_VIDEO) {
 hdlr_type = "vide";
 descr = "VideoHandler";
-} else {
+} else if (track->enc->codec_type == CODEC_TYPE_AUDIO){
 hdlr_type = "soun";
 descr = "SoundHandler";
+} else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE){
+if (track->mode == MODE_IPOD) hdlr_type = "sbtl";
+else                          hdlr_type = "text";
+descr = "SubtitleHandler";
 }
 }
 put_be32(pb, 0); /* size */
 put_tag(pb, "hdlr");
 int64_t pos = url_ftell(pb);
 put_be32(pb, 0); /* size */
 put_tag(pb, "minf");
 if(track->enc->codec_type == CODEC_TYPE_VIDEO)
 mov_write_vmhd_tag(pb);
-else
+else if (track->enc->codec_type == CODEC_TYPE_AUDIO)
 mov_write_smhd_tag(pb);
+else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
+if (track->mode == MODE_MOV)
+mov_write_gmhd_tag(pb);
+else
+mov_write_nmhd_tag(pb);
+}
 if (track->mode == MODE_MOV) /* FIXME: Why do it for MODE_MOV only ? */
 mov_write_hdlr_tag(pb, NULL);
 mov_write_dinf_tag(pb);
 mov_write_stbl_tag(pb, track);
 return updateSize(pb, pos);
 put_be32(pb, 0x0); /* reserved */
 put_be32(pb, 0x0); /* reserved */
 put_be32(pb, 0x40000000); /* reserved */
 /* Track width and height, for visual only */
-if(track->enc->codec_type == CODEC_TYPE_VIDEO) {
+if(track->enc->codec_type == CODEC_TYPE_VIDEO ||
+track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
 double sample_aspect_ratio = av_q2d(st->sample_aspect_ratio);
 if(!sample_aspect_ratio) sample_aspect_ratio = 1;
 put_be32(pb, sample_aspect_ratio * track->enc->width*0x10000);
 put_be32(pb, track->enc->height*0x10000);
 }
 track->enc->codec_id == CODEC_ID_MP3 && track->enc->sample_rate < 16000){
 av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n",
 i, track->enc->sample_rate);
 return -1;
 }
+}else if(st->codec->codec_type == CODEC_TYPE_SUBTITLE){
+track->timescale = st->codec->time_base.den;
+av_set_pts_info(st, 64, 1, st->codec->time_base.den);
 }
 }
 mov_write_mdat_tag(pb, mov);
 mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based

Mercurial > libavformat.hg

comparison movenc.c @ 4193:2d3be324c648 libavformat