[FFmpeg-cvslog] r23237 - in branches/0.6: . libavformat/Makefile libavformat/movenc.c libavformat/movenc.h libavformat/movenchint.c
mstorsjo
subversion
Fri May 21 23:46:23 CEST 2010
Author: mstorsjo
Date: Fri May 21 23:46:23 2010
New Revision: 23237
Log:
Add initial support for RTP hinting in the mov muxer
backport r23164 by mstorsjo
Added:
branches/0.6/libavformat/movenchint.c
- copied unchanged from r23164, trunk/libavformat/movenchint.c
Modified:
branches/0.6/ (props changed)
branches/0.6/libavformat/Makefile
branches/0.6/libavformat/movenc.c
branches/0.6/libavformat/movenc.h
Modified: branches/0.6/libavformat/Makefile
==============================================================================
--- branches/0.6/libavformat/Makefile Fri May 21 23:45:54 2010 (r23236)
+++ branches/0.6/libavformat/Makefile Fri May 21 23:46:23 2010 (r23237)
@@ -114,7 +114,7 @@ OBJS-$(CONFIG_MM_DEMUXER)
OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o raw.o
OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o
OBJS-$(CONFIG_MOV_DEMUXER) += mov.o riff.o isom.o
-OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o avc.o
+OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o avc.o movenchint.o
OBJS-$(CONFIG_MP2_MUXER) += mp3.o id3v1.o
OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o id3v1.o id3v2.o
OBJS-$(CONFIG_MP3_MUXER) += mp3.o id3v1.o id3v2.o
Modified: branches/0.6/libavformat/movenc.c
==============================================================================
--- branches/0.6/libavformat/movenc.c Fri May 21 23:45:54 2010 (r23236)
+++ branches/0.6/libavformat/movenc.c Fri May 21 23:46:23 2010 (r23237)
@@ -29,6 +29,8 @@
#include "avc.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/put_bits.h"
+#include "internal.h"
+#include "libavutil/avstring.h"
#undef NDEBUG
#include <assert.h>
@@ -806,6 +808,26 @@ static int mov_write_video_tag(ByteIOCon
return updateSize(pb, pos);
}
+static int mov_write_rtp_tag(ByteIOContext *pb, MOVTrack *track)
+{
+ int64_t pos = url_ftell(pb);
+ put_be32(pb, 0); /* size */
+ put_tag(pb, "rtp ");
+ put_be32(pb, 0); /* Reserved */
+ put_be16(pb, 0); /* Reserved */
+ put_be16(pb, 1); /* Data-reference index */
+
+ put_be16(pb, 1); /* Hint track version */
+ put_be16(pb, 1); /* Highest compatible version */
+ put_be32(pb, track->max_packet_size); /* Max packet size */
+
+ put_be32(pb, 12); /* size */
+ put_tag(pb, "tims");
+ put_be32(pb, track->timescale);
+
+ return updateSize(pb, pos);
+}
+
static int mov_write_stsd_tag(ByteIOContext *pb, MOVTrack *track)
{
int64_t pos = url_ftell(pb);
@@ -819,6 +841,8 @@ static int mov_write_stsd_tag(ByteIOCont
mov_write_audio_tag(pb, track);
else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE)
mov_write_subtitle_tag(pb, track);
+ else if (track->enc->codec_tag == MKTAG('r','t','p',' '))
+ mov_write_rtp_tag(pb, track);
return updateSize(pb, pos);
}
@@ -918,7 +942,8 @@ static int mov_write_stbl_tag(ByteIOCont
put_tag(pb, "stbl");
mov_write_stsd_tag(pb, track);
mov_write_stts_tag(pb, track);
- if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO &&
+ if ((track->enc->codec_type == AVMEDIA_TYPE_VIDEO ||
+ track->enc->codec_tag == MKTAG('r','t','p',' ')) &&
track->hasKeyframes && track->hasKeyframes < track->entry)
mov_write_stss_tag(pb, track, MOV_SYNC_SAMPLE);
if (track->mode == MODE_MOV && track->flags & MOV_TRACK_STPS)
@@ -1005,6 +1030,9 @@ static int mov_write_hdlr_tag(ByteIOCont
if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
else hdlr_type = "text";
descr = "SubtitleHandler";
+ } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) {
+ hdlr_type = "hint";
+ descr = "HintHandler";
}
}
@@ -1024,6 +1052,21 @@ static int mov_write_hdlr_tag(ByteIOCont
return updateSize(pb, pos);
}
+static int mov_write_hmhd_tag(ByteIOContext *pb)
+{
+ /* This atom must be present, but leaving the values at zero
+ * seems harmless. */
+ put_be32(pb, 28); /* size */
+ put_tag(pb, "hmhd");
+ put_be32(pb, 0); /* version, flags */
+ put_be16(pb, 0); /* maxPDUsize */
+ put_be16(pb, 0); /* avgPDUsize */
+ put_be32(pb, 0); /* maxbitrate */
+ put_be32(pb, 0); /* avgbitrate */
+ put_be32(pb, 0); /* reserved */
+ return 28;
+}
+
static int mov_write_minf_tag(ByteIOContext *pb, MOVTrack *track)
{
int64_t pos = url_ftell(pb);
@@ -1036,6 +1079,8 @@ static int mov_write_minf_tag(ByteIOCont
else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) {
if (track->tag == MKTAG('t','e','x','t')) mov_write_gmhd_tag(pb);
else mov_write_nmhd_tag(pb);
+ } else if (track->tag == MKTAG('r','t','p',' ')) {
+ mov_write_hmhd_tag(pb);
}
if (track->mode == MODE_MOV) /* FIXME: Why do it for MODE_MOV only ? */
mov_write_hdlr_tag(pb, NULL);
@@ -1191,6 +1236,25 @@ static int mov_write_uuid_tag_psp(ByteIO
return 0x34;
}
+static int mov_write_udta_sdp(ByteIOContext *pb, AVCodecContext *ctx, int index)
+{
+ char buf[1000] = "";
+ int len;
+
+ ff_sdp_write_media(buf, sizeof(buf), ctx, NULL, 0, 0);
+ av_strlcatf(buf, sizeof(buf), "a=control:streamid=%d\r\n", index);
+ len = strlen(buf);
+
+ put_be32(pb, len + 24);
+ put_tag (pb, "udta");
+ put_be32(pb, len + 16);
+ put_tag (pb, "hnti");
+ put_be32(pb, len + 8);
+ put_tag (pb, "sdp ");
+ put_buffer(pb, buf, len);
+ return len + 24;
+}
+
static int mov_write_trak_tag(ByteIOContext *pb, MOVTrack *track, AVStream *st)
{
int64_t pos = url_ftell(pb);
@@ -1204,6 +1268,8 @@ static int mov_write_trak_tag(ByteIOCont
mov_write_mdia_tag(pb, track);
if (track->mode == MODE_PSP)
mov_write_uuid_tag_psp(pb,track); // PSP Movies require this uuid box
+ if (track->tag == MKTAG('r','t','p',' '))
+ mov_write_udta_sdp(pb, track->rtp_ctx->streams[0]->codec, track->trackID);
return updateSize(pb, pos);
}
@@ -1618,6 +1684,13 @@ static int mov_write_moov_tag(ByteIOCont
mov->tracks[i].tref_tag = MKTAG('c','h','a','p');
mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].trackID;
}
+ for (i = 0; i < mov->nb_streams; i++) {
+ if (mov->tracks[i].tag == MKTAG('r','t','p',' ')) {
+ mov->tracks[i].tref_tag = MKTAG('h','i','n','t');
+ mov->tracks[i].tref_id =
+ mov->tracks[mov->tracks[i].src_track].trackID;
+ }
+ }
mov_write_mvhd_tag(pb, mov);
//mov_write_iods_tag(pb, mov);
@@ -1878,6 +1951,9 @@ int ff_mov_write_packet(AVFormatContext
mov->mdat_size += size;
put_flush_packet(pb);
+
+ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams)
+ ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry);
return 0;
}
@@ -1920,7 +1996,7 @@ static int mov_write_header(AVFormatCont
{
ByteIOContext *pb = s->pb;
MOVMuxContext *mov = s->priv_data;
- int i;
+ int i, hint_track = 0;
if (url_is_streamed(s->pb)) {
av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n");
@@ -1951,6 +2027,18 @@ static int mov_write_header(AVFormatCont
if (mov->mode & (MODE_MOV|MODE_IPOD) && s->nb_chapters)
mov->chapter_track = mov->nb_streams++;
+ if (s->flags & AVFMT_FLAG_RTP_HINT) {
+ /* Add hint tracks for each audio and video stream */
+ hint_track = mov->nb_streams;
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
+ st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ mov->nb_streams++;
+ }
+ }
+ }
+
mov->tracks = av_mallocz(mov->nb_streams*sizeof(*mov->tracks));
if (!mov->tracks)
return AVERROR(ENOMEM);
@@ -1971,6 +2059,9 @@ static int mov_write_header(AVFormatCont
"codec not currently supported in container\n", i);
goto error;
}
+ /* If hinting of this track is enabled by a later hint track,
+ * this is updated. */
+ track->hint_track = -1;
if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
if (track->tag == MKTAG('m','x','3','p') || track->tag == MKTAG('m','x','3','n') ||
track->tag == MKTAG('m','x','4','p') || track->tag == MKTAG('m','x','4','n') ||
@@ -2025,6 +2116,18 @@ static int mov_write_header(AVFormatCont
if (mov->chapter_track)
mov_create_chapter_track(s, mov->chapter_track);
+ if (s->flags & AVFMT_FLAG_RTP_HINT) {
+ /* Initialize the hint tracks for each audio and video stream */
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
+ st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ ff_mov_init_hinting(s, hint_track, i);
+ hint_track++;
+ }
+ }
+ }
+
put_flush_packet(pb);
return 0;
@@ -2061,6 +2164,8 @@ static int mov_write_trailer(AVFormatCon
av_freep(&mov->tracks[mov->chapter_track].enc);
for (i=0; i<mov->nb_streams; i++) {
+ if (mov->tracks[i].tag == MKTAG('r','t','p',' '))
+ ff_mov_close_hinting(&mov->tracks[i]);
av_freep(&mov->tracks[i].cluster);
if(mov->tracks[i].vosLen) av_free(mov->tracks[i].vosData);
Modified: branches/0.6/libavformat/movenc.h
==============================================================================
--- branches/0.6/libavformat/movenc.h Fri May 21 23:45:54 2010 (r23236)
+++ branches/0.6/libavformat/movenc.h Fri May 21 23:46:23 2010 (r23237)
@@ -29,6 +29,8 @@
#define MOV_INDEX_CLUSTER_SIZE 16384
#define MOV_TIMESCALE 1000
+#define RTP_MAX_PACKET_SIZE 1450
+
#define MODE_MP4 0x01
#define MODE_MOV 0x02
#define MODE_3GP 0x04
@@ -73,6 +75,13 @@ typedef struct MOVIndex {
int height; ///< active picture (w/o VBI) height for D-10/IMX
uint32_t tref_tag;
int tref_id; ///< trackID of the referenced track
+
+ int hint_track; ///< the track that hints this track, -1 if no hint track is set
+ int src_track; ///< the track that this hint track describes
+ AVFormatContext *rtp_ctx; ///< the format context for the hinting rtp muxer
+ uint32_t prev_rtp_ts;
+ int64_t cur_rtp_ts_unwrapped;
+ uint32_t max_packet_size;
} MOVTrack;
typedef struct MOVMuxContext {
@@ -87,4 +96,9 @@ typedef struct MOVMuxContext {
int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt);
+int ff_mov_init_hinting(AVFormatContext *s, int index, int src_index);
+int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt,
+ int track_index, int sample);
+void ff_mov_close_hinting(MOVTrack *track);
+
#endif /* AVFORMAT_MOVENC_H */
More information about the ffmpeg-cvslog
mailing list