[FFmpeg-cvslog] r11498 - in trunk/libavformat: Makefile avc.c avc.h movenc.c
aurel
subversion
Fri Jan 11 02:24:55 CET 2008
Author: aurel
Date: Fri Jan 11 02:24:55 2008
New Revision: 11498
Log:
Move isom_write_avcc() and related functions into a separate file.
Added:
trunk/libavformat/avc.c
- copied, changed from r11497, /trunk/libavformat/movenc.c
trunk/libavformat/avc.h
Modified:
trunk/libavformat/Makefile
trunk/libavformat/movenc.c
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile (original)
+++ trunk/libavformat/Makefile Fri Jan 11 02:24:55 2008
@@ -79,11 +79,11 @@ 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
+OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_MP2_MUXER) += mp3.o
OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o
OBJS-$(CONFIG_MP3_MUXER) += mp3.o
-OBJS-$(CONFIG_MP4_MUXER) += movenc.o riff.o isom.o
+OBJS-$(CONFIG_MP4_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o
OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o
OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o
@@ -113,7 +113,7 @@ OBJS-$(CONFIG_OGG_DEMUXER)
oggparsevorbis.o \
riff.o
OBJS-$(CONFIG_OGG_MUXER) += oggenc.o
-OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o
+OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_PVA_DEMUXER) += pva.o
OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o
OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o
@@ -133,8 +133,8 @@ OBJS-$(CONFIG_SOL_DEMUXER)
OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o
OBJS-$(CONFIG_SWF_DEMUXER) += swf.o
OBJS-$(CONFIG_SWF_MUXER) += swf.o
-OBJS-$(CONFIG_TG2_MUXER) += movenc.o riff.o isom.o
-OBJS-$(CONFIG_TGP_MUXER) += movenc.o riff.o isom.o
+OBJS-$(CONFIG_TG2_MUXER) += movenc.o riff.o isom.o avc.o
+OBJS-$(CONFIG_TGP_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_THP_DEMUXER) += thp.o
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
OBJS-$(CONFIG_TTA_DEMUXER) += tta.o
Copied: trunk/libavformat/avc.c (from r11497, /trunk/libavformat/movenc.c)
==============================================================================
--- /trunk/libavformat/movenc.c (original)
+++ trunk/libavformat/avc.c Fri Jan 11 02:24:55 2008
@@ -1,7 +1,6 @@
/*
- * MOV, 3GP, MP4 muxer
- * Copyright (c) 2003 Thomas Raivio.
- * Copyright (c) 2004 Gildas Bazin <gbazin at videolan dot org>.
+ * AVC helper functions for muxers
+ * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier at smartjog.com>
*
* This file is part of FFmpeg.
*
@@ -20,400 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "riff.h"
#include "avio.h"
-#include "isom.h"
-
-#undef NDEBUG
-#include <assert.h>
-
-#define MOV_INDEX_CLUSTER_SIZE 16384
-#define globalTimescale 1000
-
-#define MODE_MP4 0
-#define MODE_MOV 1
-#define MODE_3GP 2
-#define MODE_PSP 3 // example working PSP command line:
-// ffmpeg -i testinput.avi -f psp -r 14.985 -s 320x240 -b 768 -ar 24000 -ab 32 M4V00001.MP4
-#define MODE_3G2 4
-
-typedef struct MOVIentry {
- unsigned int flags, size;
- uint64_t pos;
- unsigned int samplesInChunk;
- char key_frame;
- unsigned int entries;
- int64_t cts;
- int64_t dts;
-} MOVIentry;
-
-typedef struct MOVIndex {
- int mode;
- int entry;
- long timescale;
- long time;
- int64_t trackDuration;
- long sampleCount;
- long sampleSize;
- int hasKeyframes;
- int hasBframes;
- int language;
- int trackID;
- int tag;
- AVCodecContext *enc;
-
- int vosLen;
- uint8_t *vosData;
- MOVIentry *cluster;
- int audio_vbr;
-} MOVTrack;
-
-typedef struct MOVContext {
- int mode;
- int64_t time;
- int nb_streams;
- offset_t mdat_pos;
- uint64_t mdat_size;
- long timescale;
- MOVTrack tracks[MAX_STREAMS];
-} MOVContext;
-
-//FIXME support 64 bit variant with wide placeholders
-static offset_t updateSize (ByteIOContext *pb, offset_t pos)
-{
- offset_t curpos = url_ftell(pb);
- url_fseek(pb, pos, SEEK_SET);
- put_be32(pb, curpos - pos); /* rewrite size */
- url_fseek(pb, curpos, SEEK_SET);
-
- return curpos - pos;
-}
-
-/* Chunk offset atom */
-static int mov_write_stco_tag(ByteIOContext *pb, MOVTrack* track)
-{
- int i;
- int mode64 = 0; // use 32 bit size variant if possible
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- if (pos > UINT32_MAX) {
- mode64 = 1;
- put_tag(pb, "co64");
- } else
- put_tag(pb, "stco");
- put_be32(pb, 0); /* version & flags */
- put_be32(pb, track->entry); /* entry count */
- for (i=0; i<track->entry; i++) {
- if(mode64 == 1)
- put_be64(pb, track->cluster[i].pos);
- else
- put_be32(pb, track->cluster[i].pos);
- }
- return updateSize (pb, pos);
-}
-
-/* Sample size atom */
-static int mov_write_stsz_tag(ByteIOContext *pb, MOVTrack* track)
-{
- int equalChunks = 1;
- int i, j, entries = 0, tst = -1, oldtst = -1;
-
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "stsz");
- put_be32(pb, 0); /* version & flags */
-
- for (i=0; i<track->entry; i++) {
- tst = track->cluster[i].size/track->cluster[i].entries;
- if(oldtst != -1 && tst != oldtst) {
- equalChunks = 0;
- }
- oldtst = tst;
- entries += track->cluster[i].entries;
- }
- if (equalChunks) {
- int sSize = track->cluster[0].size/track->cluster[0].entries;
- put_be32(pb, sSize); // sample size
- put_be32(pb, entries); // sample count
- }
- else {
- put_be32(pb, 0); // sample size
- put_be32(pb, entries); // sample count
- for (i=0; i<track->entry; i++) {
- for ( j=0; j<track->cluster[i].entries; j++) {
- put_be32(pb, track->cluster[i].size /
- track->cluster[i].entries);
- }
- }
- }
- return updateSize (pb, pos);
-}
-
-/* Sample to chunk atom */
-static int mov_write_stsc_tag(ByteIOContext *pb, MOVTrack* track)
-{
- int index = 0, oldval = -1, i;
- offset_t entryPos, curpos;
-
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "stsc");
- put_be32(pb, 0); // version & flags
- entryPos = url_ftell(pb);
- put_be32(pb, track->entry); // entry count
- for (i=0; i<track->entry; i++) {
- if(oldval != track->cluster[i].samplesInChunk)
- {
- put_be32(pb, i+1); // first chunk
- put_be32(pb, track->cluster[i].samplesInChunk); // samples per chunk
- put_be32(pb, 0x1); // sample description index
- oldval = track->cluster[i].samplesInChunk;
- index++;
- }
- }
- curpos = url_ftell(pb);
- url_fseek(pb, entryPos, SEEK_SET);
- put_be32(pb, index); // rewrite size
- url_fseek(pb, curpos, SEEK_SET);
-
- return updateSize (pb, pos);
-}
-
-/* Sync sample atom */
-static int mov_write_stss_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_t curpos, entryPos;
- int i, index = 0;
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); // size
- put_tag(pb, "stss");
- put_be32(pb, 0); // version & flags
- entryPos = url_ftell(pb);
- put_be32(pb, track->entry); // entry count
- for (i=0; i<track->entry; i++) {
- if(track->cluster[i].key_frame == 1) {
- put_be32(pb, i+1);
- index++;
- }
- }
- curpos = url_ftell(pb);
- url_fseek(pb, entryPos, SEEK_SET);
- put_be32(pb, index); // rewrite size
- url_fseek(pb, curpos, SEEK_SET);
- return updateSize (pb, pos);
-}
-
-static int mov_write_amr_tag(ByteIOContext *pb, MOVTrack *track)
-{
- put_be32(pb, 0x11); /* size */
- if (track->mode == MODE_MOV) put_tag(pb, "samr");
- else put_tag(pb, "damr");
- put_tag(pb, "FFMP");
- put_byte(pb, 0); /* decoder version */
-
- put_be16(pb, 0x81FF); /* Mode set (all modes for AMR_NB) */
- put_byte(pb, 0x00); /* Mode change period (no restriction) */
- put_byte(pb, 0x01); /* Frames per sample */
- return 0x11;
-}
-
-static int mov_write_enda_tag(ByteIOContext *pb)
-{
- put_be32(pb, 10);
- put_tag(pb, "enda");
- put_be16(pb, 1); /* little endian */
- return 10;
-}
-
-static unsigned int descrLength(unsigned int len)
-{
- int i;
- for(i=1; len>>(7*i); i++);
- return len + 1 + i;
-}
-
-static void putDescr(ByteIOContext *pb, int tag, unsigned int size)
-{
- int i= descrLength(size) - size - 2;
- put_byte(pb, tag);
- for(; i>0; i--)
- put_byte(pb, (size>>(7*i)) | 0x80);
- put_byte(pb, size & 0x7F);
-}
-
-static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
-{
- offset_t pos = url_ftell(pb);
- int decoderSpecificInfoLen = track->vosLen ? descrLength(track->vosLen):0;
-
- put_be32(pb, 0); // size
- put_tag(pb, "esds");
- put_be32(pb, 0); // Version
-
- // ES descriptor
- putDescr(pb, 0x03, 3 + descrLength(13 + decoderSpecificInfoLen) +
- descrLength(1));
- put_be16(pb, track->trackID);
- put_byte(pb, 0x00); // flags (= no flags)
-
- // DecoderConfig descriptor
- putDescr(pb, 0x04, 13 + decoderSpecificInfoLen);
-
- // Object type indication
- put_byte(pb, codec_get_tag(ff_mp4_obj_type, track->enc->codec_id));
-
- // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)
- // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
- if(track->enc->codec_type == CODEC_TYPE_AUDIO)
- put_byte(pb, 0x15); // flags (= Audiostream)
- else
- put_byte(pb, 0x11); // flags (= Visualstream)
-
- put_byte(pb, track->enc->rc_buffer_size>>(3+16)); // Buffersize DB (24 bits)
- put_be16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB
-
- put_be32(pb, FFMAX(track->enc->bit_rate, track->enc->rc_max_rate)); // maxbitrate (FIXME should be max rate in any 1 sec window)
- if(track->enc->rc_max_rate != track->enc->rc_min_rate || track->enc->rc_min_rate==0)
- put_be32(pb, 0); // vbr
- else
- put_be32(pb, track->enc->rc_max_rate); // avg bitrate
-
- if (track->vosLen)
- {
- // DecoderSpecific info descriptor
- putDescr(pb, 0x05, track->vosLen);
- put_buffer(pb, track->vosData, track->vosLen);
- }
-
-
- // SL descriptor
- putDescr(pb, 0x06, 1);
- put_byte(pb, 0x02);
- return updateSize (pb, pos);
-}
-
-static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_t pos = url_ftell(pb);
-
- put_be32(pb, 0); /* size */
- put_tag(pb, "wave");
-
- put_be32(pb, 12); /* size */
- put_tag(pb, "frma");
- put_le32(pb, track->tag);
-
- if (track->enc->codec_id == CODEC_ID_AAC) {
- /* useless atom needed by mplayer, ipod, not needed by quicktime */
- put_be32(pb, 12); /* size */
- put_tag(pb, "mp4a");
- put_be32(pb, 0);
- mov_write_esds_tag(pb, track);
- } else if (track->enc->codec_id == CODEC_ID_PCM_S24LE ||
- track->enc->codec_id == CODEC_ID_PCM_S32LE) {
- mov_write_enda_tag(pb);
- } else if (track->enc->codec_id == CODEC_ID_AMR_NB) {
- mov_write_amr_tag(pb, track);
- }
-
- put_be32(pb, 8); /* size */
- put_be32(pb, 0); /* null tag */
-
- return updateSize (pb, pos);
-}
-
-static int mov_write_glbl_tag(ByteIOContext *pb, MOVTrack* track)
-{
- put_be32(pb, track->vosLen+8);
- put_tag(pb, "glbl");
- put_buffer(pb, track->vosData, track->vosLen);
- return 8+track->vosLen;
-}
-
-static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_t pos = url_ftell(pb);
- int version = track->mode == MODE_MOV &&
- (track->audio_vbr ||
- track->enc->codec_id == CODEC_ID_PCM_S32LE ||
- track->enc->codec_id == CODEC_ID_PCM_S24LE);
-
- 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, XXX == 1 */
-
- /* SoundDescription */
- put_be16(pb, version); /* Version */
- put_be16(pb, 0); /* Revision level */
- put_be32(pb, 0); /* Reserved */
-
- if (track->mode == MODE_MOV) {
- put_be16(pb, track->enc->channels);
- if (track->enc->codec_id == CODEC_ID_PCM_U8 ||
- track->enc->codec_id == CODEC_ID_PCM_S8)
- put_be16(pb, 8); /* bits per sample */
- else
- put_be16(pb, 16);
- put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */
- } else { /* reserved for mp4/3gp */
- put_be16(pb, 2);
- put_be16(pb, 16);
- put_be16(pb, 0);
- }
-
- put_be16(pb, 0); /* packet size (= 0) */
- put_be16(pb, track->timescale); /* Time scale */
- put_be16(pb, 0); /* Reserved */
-
- if(version == 1) { /* SoundDescription V1 extended info */
- put_be32(pb, track->enc->frame_size); /* Samples per packet */
- put_be32(pb, track->sampleSize / track->enc->channels); /* Bytes per packet */
- put_be32(pb, track->sampleSize); /* Bytes per frame */
- put_be32(pb, 2); /* Bytes per sample */
- }
-
- if(track->mode == MODE_MOV &&
- (track->enc->codec_id == CODEC_ID_AAC ||
- track->enc->codec_id == CODEC_ID_AMR_NB ||
- track->enc->codec_id == CODEC_ID_PCM_S24LE ||
- track->enc->codec_id == CODEC_ID_PCM_S32LE))
- mov_write_wave_tag(pb, track);
- else if(track->enc->codec_id == CODEC_ID_AAC)
- mov_write_esds_tag(pb, track);
- else if(track->enc->codec_id == CODEC_ID_AMR_NB)
- mov_write_amr_tag(pb, track);
- else if(track->vosLen > 0)
- mov_write_glbl_tag(pb, track);
-
- return updateSize (pb, pos);
-}
-
-static int mov_write_d263_tag(ByteIOContext *pb)
-{
- put_be32(pb, 0xf); /* size */
- put_tag(pb, "d263");
- put_tag(pb, "FFMP");
- put_byte(pb, 0); /* decoder version */
- /* FIXME use AVCodecContext level/profile, when encoder will set values */
- put_byte(pb, 0xa); /* level */
- put_byte(pb, 0); /* profile */
- return 0xf;
-}
-
-/* TODO: No idea about these values */
-static int mov_write_svq3_tag(ByteIOContext *pb)
-{
- put_be32(pb, 0x15);
- put_tag(pb, "SMI ");
- put_tag(pb, "SEQH");
- put_be32(pb, 0x5);
- put_be32(pb, 0xe2c0211d);
- put_be32(pb, 0xc0000000);
- put_byte(pb, 0);
- return 0x15;
-}
static uint8_t *avc_find_startcode( uint8_t *p, uint8_t *end )
{
@@ -452,7 +58,7 @@ static uint8_t *avc_find_startcode( uint
return end + 3;
}
-static int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
+int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
{
ByteIOContext *pb;
uint8_t *p = buf_in;
@@ -475,7 +81,7 @@ static int avc_parse_nal_units(uint8_t *
return 0;
}
-static int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)
+int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)
{
if (len > 6) {
/* check for h264 start code */
@@ -527,1276 +133,3 @@ static int isom_write_avcc(ByteIOContext
}
return 0;
}
-
-static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)
-{
- offset_t pos = url_ftell(pb);
-
- put_be32(pb, 0);
- put_tag(pb, "avcC");
- isom_write_avcc(pb, track->vosData, track->vosLen);
- return updateSize(pb, pos);
-}
-
-/* also used by all avid codecs (dv, imx, meridien) and their variants */
-static int mov_write_avid_tag(ByteIOContext *pb, MOVTrack *track)
-{
- int i;
- put_be32(pb, 24); /* size */
- put_tag(pb, "ACLR");
- put_tag(pb, "ACLR");
- put_tag(pb, "0001");
- put_be32(pb, 1); /* yuv 1 / rgb 2 ? */
- put_be32(pb, 0); /* unknown */
-
- put_be32(pb, 24); /* size */
- put_tag(pb, "APRG");
- put_tag(pb, "APRG");
- put_tag(pb, "0001");
- put_be32(pb, 1); /* unknown */
- put_be32(pb, 0); /* unknown */
-
- put_be32(pb, 120); /* size */
- put_tag(pb, "ARES");
- put_tag(pb, "ARES");
- put_tag(pb, "0001");
- put_be32(pb, AV_RB32(track->vosData + 0x28)); /* dnxhd cid, some id ? */
- put_be32(pb, track->enc->width);
- /* values below are based on samples created with quicktime and avid codecs */
- if (track->vosData[5] & 2) { // interlaced
- put_be32(pb, track->enc->height/2);
- put_be32(pb, 2); /* unknown */
- put_be32(pb, 0); /* unknown */
- put_be32(pb, 4); /* unknown */
- } else {
- put_be32(pb, track->enc->height);
- put_be32(pb, 1); /* unknown */
- put_be32(pb, 0); /* unknown */
- if (track->enc->height == 1080)
- put_be32(pb, 5); /* unknown */
- else
- put_be32(pb, 6); /* unknown */
- }
- /* padding */
- for (i = 0; i < 10; i++)
- put_be64(pb, 0);
-
- /* extra padding for stsd needed */
- put_be32(pb, 0);
- return 0;
-}
-
-static int mov_find_video_codec_tag(AVFormatContext *s, MOVTrack *track)
-{
- int tag = track->enc->codec_tag;
- if (!tag) {
- if (track->enc->codec_id == CODEC_ID_DVVIDEO) {
- if (track->enc->height == 480) { /* NTSC */
- if (track->enc->pix_fmt == PIX_FMT_YUV422P)
- tag = MKTAG('d', 'v', '5', 'n');
- else
- tag = MKTAG('d', 'v', 'c', ' ');
- } else { /* assume PAL */
- if (track->enc->pix_fmt == PIX_FMT_YUV422P)
- tag = MKTAG('d', 'v', '5', 'p');
- else if (track->enc->pix_fmt == PIX_FMT_YUV420P)
- tag = MKTAG('d', 'v', 'c', 'p');
- else
- tag = MKTAG('d', 'v', 'p', 'p');
- }
- } else if (track->enc->codec_id == CODEC_ID_H263) {
- if (track->mode == MODE_MOV)
- tag = MKTAG('h', '2', '6', '3');
- else
- tag = MKTAG('s', '2', '6', '3');
- } else {
- tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
- }
- }
- // if no mac fcc found, try with Microsoft tags
- if (!tag) {
- tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id);
- if (tag) {
- av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, the file may be unplayable!\n");
- }
- }
- assert(tag);
- return tag;
-}
-
-static int mov_find_audio_codec_tag(AVFormatContext *s, MOVTrack *track)
-{
- int tag = track->enc->codec_tag;
- if (!tag) {
- tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id);
- }
- // if no mac fcc found, try with Microsoft tags
- if (!tag) {
- int ms_tag = codec_get_tag(codec_wav_tags, track->enc->codec_id);
- if (ms_tag) {
- 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");
- }
- }
- assert(tag);
- return tag;
-}
-
-static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_t pos = url_ftell(pb);
- char compressor_name[32];
-
- 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 */
-
- put_be16(pb, 0); /* Codec stream version */
- put_be16(pb, 0); /* Codec stream revision (=0) */
- if (track->mode == MODE_MOV) {
- put_tag(pb, "FFMP"); /* Vendor */
- if(track->enc->codec_id == CODEC_ID_RAWVIDEO) {
- put_be32(pb, 0); /* Temporal Quality */
- put_be32(pb, 0x400); /* Spatial Quality = lossless*/
- } else {
- put_be32(pb, 0x200); /* Temporal Quality = normal */
- put_be32(pb, 0x200); /* Spatial Quality = normal */
- }
- } else {
- put_be32(pb, 0); /* Reserved */
- put_be32(pb, 0); /* Reserved */
- put_be32(pb, 0); /* Reserved */
- }
- put_be16(pb, track->enc->width); /* Video width */
- put_be16(pb, track->enc->height); /* Video height */
- put_be32(pb, 0x00480000); /* Horizontal resolution 72dpi */
- put_be32(pb, 0x00480000); /* Vertical resolution 72dpi */
- put_be32(pb, 0); /* Data size (= 0) */
- put_be16(pb, 1); /* Frame count (= 1) */
-
- memset(compressor_name,0,32);
- /* FIXME not sure, ISO 14496-1 draft where it shall be set to 0 */
- if (track->mode == MODE_MOV && track->enc->codec && track->enc->codec->name)
- strncpy(compressor_name,track->enc->codec->name,31);
- put_byte(pb, strlen(compressor_name));
- put_buffer(pb, compressor_name, 31);
-
- put_be16(pb, 0x18); /* Reserved */
- put_be16(pb, 0xffff); /* Reserved */
- if(track->enc->codec_id == CODEC_ID_MPEG4)
- mov_write_esds_tag(pb, track);
- else if(track->enc->codec_id == CODEC_ID_H263)
- mov_write_d263_tag(pb);
- else if(track->enc->codec_id == CODEC_ID_SVQ3)
- mov_write_svq3_tag(pb);
- else if(track->enc->codec_id == CODEC_ID_H264)
- mov_write_avcc_tag(pb, track);
- else if(track->enc->codec_id == CODEC_ID_DNXHD)
- mov_write_avid_tag(pb, track);
- else if(track->vosLen > 0)
- mov_write_glbl_tag(pb, track);
-
- return updateSize (pb, pos);
-}
-
-static int mov_write_stsd_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "stsd");
- put_be32(pb, 0); /* version & flags */
- 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);
- return updateSize(pb, pos);
-}
-
-static int mov_write_ctts_tag(ByteIOContext *pb, MOVTrack* track)
-{
- MOV_stts_t *ctts_entries;
- uint32_t entries = 0;
- uint32_t atom_size;
- int i;
-
- ctts_entries = av_malloc((track->entry + 1) * sizeof(*ctts_entries)); /* worst case */
- ctts_entries[0].count = 1;
- ctts_entries[0].duration = track->cluster[0].cts;
- for (i=1; i<track->entry; i++) {
- if (track->cluster[i].cts == ctts_entries[entries].duration) {
- ctts_entries[entries].count++; /* compress */
- } else {
- entries++;
- ctts_entries[entries].duration = track->cluster[i].cts;
- ctts_entries[entries].count = 1;
- }
- }
- entries++; /* last one */
- atom_size = 16 + (entries * 8);
- put_be32(pb, atom_size); /* size */
- put_tag(pb, "ctts");
- put_be32(pb, 0); /* version & flags */
- put_be32(pb, entries); /* entry count */
- for (i=0; i<entries; i++) {
- put_be32(pb, ctts_entries[i].count);
- put_be32(pb, ctts_entries[i].duration);
- }
- av_free(ctts_entries);
- return atom_size;
-}
-
-/* Time to sample atom */
-static int mov_write_stts_tag(ByteIOContext *pb, MOVTrack* track)
-{
- MOV_stts_t *stts_entries;
- uint32_t entries = -1;
- uint32_t atom_size;
- int i;
-
- if (track->enc->codec_type == CODEC_TYPE_AUDIO && !track->audio_vbr) {
- stts_entries = av_malloc(sizeof(*stts_entries)); /* one entry */
- stts_entries[0].count = track->sampleCount;
- stts_entries[0].duration = 1;
- entries = 1;
- } else {
- stts_entries = av_malloc(track->entry * sizeof(*stts_entries)); /* worst case */
- for (i=0; i<track->entry; i++) {
- int64_t duration = i + 1 == track->entry ?
- track->trackDuration - track->cluster[i].dts + track->cluster[0].dts : /* readjusting */
- track->cluster[i+1].dts - track->cluster[i].dts;
- if (i && duration == stts_entries[entries].duration) {
- stts_entries[entries].count++; /* compress */
- } else {
- entries++;
- stts_entries[entries].duration = duration;
- stts_entries[entries].count = 1;
- }
- }
- entries++; /* last one */
- }
- atom_size = 16 + (entries * 8);
- put_be32(pb, atom_size); /* size */
- put_tag(pb, "stts");
- put_be32(pb, 0); /* version & flags */
- put_be32(pb, entries); /* entry count */
- for (i=0; i<entries; i++) {
- put_be32(pb, stts_entries[i].count);
- put_be32(pb, stts_entries[i].duration);
- }
- av_free(stts_entries);
- return atom_size;
-}
-
-static int mov_write_dref_tag(ByteIOContext *pb)
-{
- put_be32(pb, 28); /* size */
- put_tag(pb, "dref");
- put_be32(pb, 0); /* version & flags */
- put_be32(pb, 1); /* entry count */
-
- put_be32(pb, 0xc); /* size */
- put_tag(pb, "url ");
- put_be32(pb, 1); /* version & flags */
-
- return 28;
-}
-
-static int mov_write_stbl_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "stbl");
- mov_write_stsd_tag(pb, track);
- mov_write_stts_tag(pb, track);
- if (track->enc->codec_type == CODEC_TYPE_VIDEO &&
- track->hasKeyframes < track->entry)
- mov_write_stss_tag(pb, track);
- if (track->enc->codec_type == CODEC_TYPE_VIDEO &&
- track->hasBframes)
- mov_write_ctts_tag(pb, track);
- mov_write_stsc_tag(pb, track);
- mov_write_stsz_tag(pb, track);
- mov_write_stco_tag(pb, track);
- return updateSize(pb, pos);
-}
-
-static int mov_write_dinf_tag(ByteIOContext *pb)
-{
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "dinf");
- mov_write_dref_tag(pb);
- return updateSize(pb, pos);
-}
-
-static int mov_write_smhd_tag(ByteIOContext *pb)
-{
- put_be32(pb, 16); /* size */
- put_tag(pb, "smhd");
- put_be32(pb, 0); /* version & flags */
- put_be16(pb, 0); /* reserved (balance, normally = 0) */
- put_be16(pb, 0); /* reserved */
- return 16;
-}
-
-static int mov_write_vmhd_tag(ByteIOContext *pb)
-{
- put_be32(pb, 0x14); /* size (always 0x14) */
- put_tag(pb, "vmhd");
- put_be32(pb, 0x01); /* version & flags */
- put_be64(pb, 0); /* reserved (graphics mode = copy) */
- return 0x14;
-}
-
-static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track)
-{
- const char *descr, *hdlr, *hdlr_type;
- offset_t pos = url_ftell(pb);
-
- if (!track) { /* no media --> data handler */
- hdlr = "dhlr";
- hdlr_type = "url ";
- descr = "DataHandler";
- } 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 {
- hdlr_type = "soun";
- descr = "SoundHandler";
- }
- }
-
- put_be32(pb, 0); /* size */
- put_tag(pb, "hdlr");
- put_be32(pb, 0); /* Version & flags */
- put_buffer(pb, hdlr, 4); /* handler */
- put_tag(pb, hdlr_type); /* handler type */
- put_be32(pb ,0); /* reserved */
- put_be32(pb ,0); /* reserved */
- put_be32(pb ,0); /* reserved */
- put_byte(pb, strlen(descr)); /* string counter */
- put_buffer(pb, descr, strlen(descr)); /* handler description */
- return updateSize(pb, pos);
-}
-
-static int mov_write_minf_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_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
- mov_write_smhd_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);
-}
-
-static int mov_write_mdhd_tag(ByteIOContext *pb, MOVTrack* track)
-{
- int version = track->trackDuration < INT32_MAX ? 0 : 1;
-
- (version == 1) ? put_be32(pb, 44) : put_be32(pb, 32); /* size */
- put_tag(pb, "mdhd");
- put_byte(pb, version);
- put_be24(pb, 0); /* flags */
- if (version == 1) {
- put_be64(pb, track->time);
- put_be64(pb, track->time);
- } else {
- put_be32(pb, track->time); /* creation time */
- put_be32(pb, track->time); /* modification time */
- }
- put_be32(pb, track->timescale); /* time scale (sample rate for audio) */
- (version == 1) ? put_be64(pb, track->trackDuration) : put_be32(pb, track->trackDuration); /* duration */
- put_be16(pb, track->language); /* language */
- put_be16(pb, 0); /* reserved (quality) */
-
- if(version!=0 && track->mode == MODE_MOV){
- av_log(NULL, AV_LOG_ERROR,
- "FATAL error, file duration too long for timebase, this file will not be\n"
- "playable with quicktime. Choose a different timebase or a different\n"
- "container format\n");
- }
-
- return 32;
-}
-
-static int mov_write_mdia_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "mdia");
- mov_write_mdhd_tag(pb, track);
- mov_write_hdlr_tag(pb, track);
- mov_write_minf_tag(pb, track);
- return updateSize(pb, pos);
-}
-
-static int mov_write_tkhd_tag(ByteIOContext *pb, MOVTrack* track)
-{
- int64_t duration = av_rescale_rnd(track->trackDuration, globalTimescale, track->timescale, AV_ROUND_UP);
- int version = duration < INT32_MAX ? 0 : 1;
-
- (version == 1) ? put_be32(pb, 104) : put_be32(pb, 92); /* size */
- put_tag(pb, "tkhd");
- put_byte(pb, version);
- put_be24(pb, 0xf); /* flags (track enabled) */
- if (version == 1) {
- put_be64(pb, track->time);
- put_be64(pb, track->time);
- } else {
- put_be32(pb, track->time); /* creation time */
- put_be32(pb, track->time); /* modification time */
- }
- put_be32(pb, track->trackID); /* track-id */
- put_be32(pb, 0); /* reserved */
- (version == 1) ? put_be64(pb, duration) : put_be32(pb, duration);
-
- put_be32(pb, 0); /* reserved */
- put_be32(pb, 0); /* reserved */
- put_be32(pb, 0x0); /* reserved (Layer & Alternate group) */
- /* Volume, only for audio */
- if(track->enc->codec_type == CODEC_TYPE_AUDIO)
- put_be16(pb, 0x0100);
- else
- put_be16(pb, 0);
- put_be16(pb, 0); /* reserved */
-
- /* Matrix structure */
- put_be32(pb, 0x00010000); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x00010000); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- 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) {
- double sample_aspect_ratio = av_q2d(track->enc->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);
- }
- else {
- put_be32(pb, 0);
- put_be32(pb, 0);
- }
- return 0x5c;
-}
-
-// This box seems important for the psp playback ... without it the movie seems to hang
-static int mov_write_edts_tag(ByteIOContext *pb, MOVTrack *track)
-{
- put_be32(pb, 0x24); /* size */
- put_tag(pb, "edts");
- put_be32(pb, 0x1c); /* size */
- put_tag(pb, "elst");
- put_be32(pb, 0x0);
- put_be32(pb, 0x1);
-
- put_be32(pb, av_rescale_rnd(track->trackDuration, globalTimescale, track->timescale, AV_ROUND_UP)); /* duration ... doesn't seem to effect psp */
-
- put_be32(pb, track->cluster[0].cts); /* first pts is cts since dts is 0 */
- put_be32(pb, 0x00010000);
- return 0x24;
-}
-
-// goes at the end of each track! ... Critical for PSP playback ("Incompatible data" without it)
-static int mov_write_uuid_tag_psp(ByteIOContext *pb, MOVTrack *mov)
-{
- put_be32(pb, 0x34); /* size ... reports as 28 in mp4box! */
- put_tag(pb, "uuid");
- put_tag(pb, "USMT");
- put_be32(pb, 0x21d24fce);
- put_be32(pb, 0xbb88695c);
- put_be32(pb, 0xfac9c740);
- put_be32(pb, 0x1c); // another size here!
- put_tag(pb, "MTDT");
- put_be32(pb, 0x00010012);
- put_be32(pb, 0x0a);
- put_be32(pb, 0x55c40000);
- put_be32(pb, 0x1);
- put_be32(pb, 0x0);
- return 0x34;
-}
-
-static int mov_write_trak_tag(ByteIOContext *pb, MOVTrack* track)
-{
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "trak");
- mov_write_tkhd_tag(pb, track);
- if (track->mode == MODE_PSP || track->hasBframes)
- mov_write_edts_tag(pb, track); // PSP Movies require edts box
- mov_write_mdia_tag(pb, track);
- if (track->mode == MODE_PSP)
- mov_write_uuid_tag_psp(pb,track); // PSP Movies require this uuid box
- return updateSize(pb, pos);
-}
-
-#if 0
-/* TODO: Not sorted out, but not necessary either */
-static int mov_write_iods_tag(ByteIOContext *pb, MOVContext *mov)
-{
- put_be32(pb, 0x15); /* size */
- put_tag(pb, "iods");
- put_be32(pb, 0); /* version & flags */
- put_be16(pb, 0x1007);
- put_byte(pb, 0);
- put_be16(pb, 0x4fff);
- put_be16(pb, 0xfffe);
- put_be16(pb, 0x01ff);
- return 0x15;
-}
-#endif
-
-static int mov_write_mvhd_tag(ByteIOContext *pb, MOVContext *mov)
-{
- int maxTrackID = 1, i;
- int64_t maxTrackLenTemp, maxTrackLen = 0;
- int version;
-
- for (i=0; i<mov->nb_streams; i++) {
- if(mov->tracks[i].entry > 0) {
- maxTrackLenTemp = av_rescale_rnd(mov->tracks[i].trackDuration, globalTimescale, mov->tracks[i].timescale, AV_ROUND_UP);
- if(maxTrackLen < maxTrackLenTemp)
- maxTrackLen = maxTrackLenTemp;
- if(maxTrackID < mov->tracks[i].trackID)
- maxTrackID = mov->tracks[i].trackID;
- }
- }
-
- version = maxTrackLen < UINT32_MAX ? 0 : 1;
- (version == 1) ? put_be32(pb, 120) : put_be32(pb, 108); /* size */
- put_tag(pb, "mvhd");
- put_byte(pb, version);
- put_be24(pb, 0); /* flags */
- if (version == 1) {
- put_be64(pb, mov->time);
- put_be64(pb, mov->time);
- } else {
- put_be32(pb, mov->time); /* creation time */
- put_be32(pb, mov->time); /* modification time */
- }
- put_be32(pb, mov->timescale); /* timescale */
- (version == 1) ? put_be64(pb, maxTrackLen) : put_be32(pb, maxTrackLen); /* duration of longest track */
-
- put_be32(pb, 0x00010000); /* reserved (preferred rate) 1.0 = normal */
- put_be16(pb, 0x0100); /* reserved (preferred volume) 1.0 = normal */
- put_be16(pb, 0); /* reserved */
- put_be32(pb, 0); /* reserved */
- put_be32(pb, 0); /* reserved */
-
- /* Matrix structure */
- put_be32(pb, 0x00010000); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x00010000); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x0); /* reserved */
- put_be32(pb, 0x40000000); /* reserved */
-
- put_be32(pb, 0); /* reserved (preview time) */
- put_be32(pb, 0); /* reserved (preview duration) */
- put_be32(pb, 0); /* reserved (poster time) */
- put_be32(pb, 0); /* reserved (selection time) */
- put_be32(pb, 0); /* reserved (selection duration) */
- put_be32(pb, 0); /* reserved (current time) */
- put_be32(pb, maxTrackID+1); /* Next track id */
- return 0x6c;
-}
-
-static int mov_write_itunes_hdlr_tag(ByteIOContext *pb, MOVContext* mov,
- AVFormatContext *s)
-{
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "hdlr");
- put_be32(pb, 0);
- put_be32(pb, 0);
- put_tag(pb, "mdir");
- put_tag(pb, "appl");
- put_be32(pb, 0);
- put_be32(pb, 0);
- put_be16(pb, 0);
- return updateSize(pb, pos);
-}
-
-/* helper function to write a data tag with the specified string as data */
-static int mov_write_string_data_tag(ByteIOContext *pb, const char *data, int long_style)
-{
- if(long_style){
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "data");
- put_be32(pb, 1);
- put_be32(pb, 0);
- put_buffer(pb, data, strlen(data));
- return updateSize(pb, pos);
- }else{
- put_be16(pb, strlen(data)); /* string length */
- put_be16(pb, 0);
- put_buffer(pb, data, strlen(data));
- return strlen(data) + 4;
- }
-}
-
-static int mov_write_string_tag(ByteIOContext *pb, const char *name, const char *value, int long_style){
- int size = 0;
- if ( value && value[0] ) {
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, name);
- mov_write_string_data_tag(pb, value, long_style);
- size= updateSize(pb, pos);
- }
- return size;
-}
-
-/* iTunes year */
-static int mov_write_day_tag(ByteIOContext *pb, int year, int long_style)
-{
- if(year){
- char year_str[5];
- snprintf(year_str, sizeof(year_str), "%04d", year);
- return mov_write_string_tag(pb, "\251day", year_str, long_style);
- }else
- return 0;
-}
-
-/* iTunes track number */
-static int mov_write_trkn_tag(ByteIOContext *pb, MOVContext* mov,
- AVFormatContext *s)
-{
- int size = 0;
- if ( s->track ) {
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "trkn");
- {
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "data");
- put_be32(pb, 0); // 8 bytes empty
- put_be32(pb, 0);
- put_be16(pb, 0); // empty
- put_be16(pb, s->track); // track number
- put_be16(pb, 0); // total track number
- put_be16(pb, 0); // empty
- updateSize(pb, pos);
- }
- size = updateSize(pb, pos);
- }
- return size;
-}
-
-/* iTunes meta data list */
-static int mov_write_ilst_tag(ByteIOContext *pb, MOVContext* mov,
- AVFormatContext *s)
-{
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "ilst");
- mov_write_string_tag(pb, "\251nam", s->title , 1);
- mov_write_string_tag(pb, "\251ART", s->author , 1);
- mov_write_string_tag(pb, "\251wrt", s->author , 1);
- mov_write_string_tag(pb, "\251alb", s->album , 1);
- mov_write_day_tag(pb, s->year ,1);
- if(mov->tracks[0].enc && !(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT))
- mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 1);
- mov_write_string_tag(pb, "\251cmt", s->comment , 1);
- mov_write_string_tag(pb, "\251gen", s->genre , 1);
- mov_write_trkn_tag(pb, mov, s);
- return updateSize(pb, pos);
-}
-
-/* iTunes meta data tag */
-static int mov_write_meta_tag(ByteIOContext *pb, MOVContext* mov,
- AVFormatContext *s)
-{
- int size = 0;
-
- // only save meta tag if required
- if ( s->title[0] || s->author[0] || s->album[0] || s->year ||
- s->comment[0] || s->genre[0] || s->track ) {
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size */
- put_tag(pb, "meta");
- put_be32(pb, 0);
- mov_write_itunes_hdlr_tag(pb, mov, s);
- mov_write_ilst_tag(pb, mov, s);
- size = updateSize(pb, pos);
- }
- return size;
-}
-
-static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
- AVFormatContext *s)
-{
- int i, req = 0;
-
- /* Requirements */
- for (i=0; i<mov->nb_streams; i++) {
- if(mov->tracks[i].entry <= 0) continue;
- if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC ||
- mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) {
- req = 1;
- break;
- }
- }
-
- if (s->title[0] || s->author[0] || s->album[0] || s->year ||
- s->comment[0] || s->genre[0] || s->track ||
- (mov->mode == MODE_MOV &&
- ((mov->tracks[0].enc && !mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT) || req))) {
- offset_t pos = url_ftell(pb);
-
- put_be32(pb, 0); /* size */
- put_tag(pb, "udta");
-
- /* iTunes meta data */
- mov_write_meta_tag(pb, mov, s);
-
- if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
- /* Requirements */
- if (req)
- mov_write_string_tag(pb, "\251req", "QuickTime 6.0 or greater", 0);
-
- mov_write_string_tag(pb, "\251nam", s->title , 0);
- mov_write_string_tag(pb, "\251aut", s->author , 0);
- mov_write_string_tag(pb, "\251alb", s->album , 0);
- mov_write_day_tag(pb, s->year, 0);
- if(mov->tracks[0].enc && !(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT))
- mov_write_string_tag(pb, "\251enc", LIBAVFORMAT_IDENT, 0);
- mov_write_string_tag(pb, "\251des", s->comment , 0);
- mov_write_string_tag(pb, "\251gen", s->genre , 0);
- }
-
- return updateSize(pb, pos);
- }
-
- return 0;
-}
-
-static int utf8len(uint8_t *b){
- int len=0;
- int val;
- while(*b){
- GET_UTF8(val, *b++, return -1;)
- len++;
- }
- return len;
-}
-
-static int ascii_to_wc (ByteIOContext *pb, uint8_t *b)
-{
- int val;
- while(*b){
- GET_UTF8(val, *b++, return -1;)
- put_be16(pb, val);
- }
- put_be16(pb, 0x00);
- return 0;
-}
-
-static uint16_t language_code (const char *str)
-{
- return ((((str[0]-0x60) & 0x1F)<<10) + (((str[1]-0x60) & 0x1F)<<5) + ((str[2]-0x60) & 0x1F));
-}
-
-static int mov_write_uuidusmt_tag (ByteIOContext *pb, AVFormatContext *s)
-{
- size_t len, size;
- offset_t pos, curpos;
-
- size = 0;
- if (s->title[0]) {
- pos = url_ftell(pb);
- put_be32(pb, 0); /* size placeholder*/
- put_tag(pb, "uuid");
- put_tag(pb, "USMT");
- put_be32(pb, 0x21d24fce ); /* 96 bit UUID */
- put_be32(pb, 0xbb88695c );
- put_be32(pb, 0xfac9c740 );
- size += 24;
-
- put_be32(pb, 0); /* size placeholder*/
- put_tag(pb, "MTDT");
- put_be16(pb, 4);
- size += 10;
-
- // ?
- put_be16(pb, 0x0C); /* size */
- put_be32(pb, 0x0B); /* type */
- put_be16(pb, language_code("und")); /* language */
- put_be16(pb, 0x0); /* ? */
- put_be16(pb, 0x021C); /* data */
- size += 12;
-
- // Encoder
- len = utf8len(LIBAVCODEC_IDENT)+1;
- if(len<=0)
- goto not_utf8;
- put_be16(pb, len*2+10); /* size */
- put_be32(pb, 0x04); /* type */
- put_be16(pb, language_code("eng")); /* language */
- put_be16(pb, 0x01); /* ? */
- ascii_to_wc(pb, LIBAVCODEC_IDENT);
- size += len*2+10;
-
- // Title
- len = utf8len(s->title)+1;
- if(len<=0)
- goto not_utf8;
- put_be16(pb, len*2+10); /* size */
- put_be32(pb, 0x01); /* type */
- put_be16(pb, language_code("eng")); /* language */
- put_be16(pb, 0x01); /* ? */
- ascii_to_wc (pb, s->title);
- size += len*2+10;
-
- // Date
-// snprintf(dt,32,"%04d/%02d/%02d %02d:%02d:%02d",t_st->tm_year+1900,t_st->tm_mon+1,t_st->tm_mday,t_st->tm_hour,t_st->tm_min,t_st->tm_sec);
- len = utf8len("2006/04/01 11:11:11")+1;
- if(len<=0)
- goto not_utf8;
- put_be16(pb, len*2+10); /* size */
- put_be32(pb, 0x03); /* type */
- put_be16(pb, language_code("und")); /* language */
- put_be16(pb, 0x01); /* ? */
- ascii_to_wc (pb, "2006/04/01 11:11:11");
- size += len*2+10;
-
- // size
- curpos = url_ftell(pb);
- url_fseek(pb, pos, SEEK_SET);
- put_be32(pb, size);
- url_fseek(pb, pos+24, SEEK_SET);
- put_be32(pb, size-24);
- url_fseek(pb, curpos, SEEK_SET);
- }
-
- return size;
-not_utf8:
- av_log(s, AV_LOG_ERROR, "not utf8\n");
- return -1;
-}
-
-static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov,
- AVFormatContext *s)
-{
- int i;
- offset_t pos = url_ftell(pb);
- put_be32(pb, 0); /* size placeholder*/
- put_tag(pb, "moov");
- mov->timescale = globalTimescale;
-
- for (i=0; i<mov->nb_streams; i++) {
- if(mov->tracks[i].entry <= 0) continue;
-
- mov->tracks[i].time = mov->time;
- mov->tracks[i].trackID = i+1;
- }
-
- mov_write_mvhd_tag(pb, mov);
- //mov_write_iods_tag(pb, mov);
- for (i=0; i<mov->nb_streams; i++) {
- if(mov->tracks[i].entry > 0) {
- mov_write_trak_tag(pb, &(mov->tracks[i]));
- }
- }
-
- if (mov->mode == MODE_PSP)
- mov_write_uuidusmt_tag(pb, s);
- else if (mov->mode != MODE_3GP && mov->mode != MODE_3G2)
- mov_write_udta_tag(pb, mov, s);
-
- return updateSize(pb, pos);
-}
-
-static int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov)
-{
- put_be32(pb, 8); // placeholder for extended size field (64 bit)
- put_tag(pb, mov->mode == MODE_MOV ? "wide" : "free");
-
- mov->mdat_pos = url_ftell(pb);
- put_be32(pb, 0); /* size placeholder*/
- put_tag(pb, "mdat");
- return 0;
-}
-
-/* TODO: This needs to be more general */
-static void mov_write_ftyp_tag (ByteIOContext *pb, AVFormatContext *s)
-{
- MOVContext *mov = s->priv_data;
-
- put_be32(pb, 0x14 ); /* size */
- put_tag(pb, "ftyp");
-
- if ( mov->mode == MODE_3GP )
- put_tag(pb, "3gp4");
- else if ( mov->mode == MODE_3G2 )
- put_tag(pb, "3g2a");
- else if ( mov->mode == MODE_PSP )
- put_tag(pb, "MSNV");
- else if ( mov->mode == MODE_MP4 )
- put_tag(pb, "isom");
- else
- put_tag(pb, "qt ");
-
- put_be32(pb, 0x200 );
-
- if ( mov->mode == MODE_3GP )
- put_tag(pb, "3gp4");
- else if ( mov->mode == MODE_3G2 )
- put_tag(pb, "3g2a");
- else if ( mov->mode == MODE_PSP )
- put_tag(pb, "MSNV");
- else if ( mov->mode == MODE_MP4 )
- put_tag(pb, "mp41");
- else
- put_tag(pb, "qt ");
-}
-
-static void mov_write_uuidprof_tag(ByteIOContext *pb, AVFormatContext *s)
-{
- AVCodecContext *VideoCodec = s->streams[0]->codec;
- AVCodecContext *AudioCodec = s->streams[1]->codec;
- int AudioRate = AudioCodec->sample_rate;
- int FrameRate = ((VideoCodec->time_base.den) * (0x10000))/ (VideoCodec->time_base.num);
- int audio_kbitrate= AudioCodec->bit_rate / 1000;
- int video_kbitrate= FFMIN(VideoCodec->bit_rate / 1000, 800 - audio_kbitrate);
-
- put_be32(pb, 0x94 ); /* size */
- put_tag(pb, "uuid");
- put_tag(pb, "PROF");
-
- put_be32(pb, 0x21d24fce ); /* 96 bit UUID */
- put_be32(pb, 0xbb88695c );
- put_be32(pb, 0xfac9c740 );
-
- put_be32(pb, 0x0 ); /* ? */
- put_be32(pb, 0x3 ); /* 3 sections ? */
-
- put_be32(pb, 0x14 ); /* size */
- put_tag(pb, "FPRF");
- put_be32(pb, 0x0 ); /* ? */
- put_be32(pb, 0x0 ); /* ? */
- put_be32(pb, 0x0 ); /* ? */
-
- put_be32(pb, 0x2c ); /* size */
- put_tag(pb, "APRF"); /* audio */
- put_be32(pb, 0x0 );
- put_be32(pb, 0x2 ); /* TrackID */
- put_tag(pb, "mp4a");
- put_be32(pb, 0x20f );
- put_be32(pb, 0x0 );
- put_be32(pb, audio_kbitrate);
- put_be32(pb, audio_kbitrate);
- put_be32(pb, AudioRate );
- put_be32(pb, AudioCodec->channels );
-
- put_be32(pb, 0x34 ); /* size */
- put_tag(pb, "VPRF"); /* video */
- put_be32(pb, 0x0 );
- put_be32(pb, 0x1 ); /* TrackID */
- if (VideoCodec->codec_id == CODEC_ID_H264) {
- put_tag(pb, "avc1");
- put_be16(pb, 0x014D );
- put_be16(pb, 0x0015 );
- } else {
- put_tag(pb, "mp4v");
- put_be16(pb, 0x0000 );
- put_be16(pb, 0x0103 );
- }
- put_be32(pb, 0x0 );
- put_be32(pb, video_kbitrate);
- put_be32(pb, video_kbitrate);
- put_be32(pb, FrameRate);
- put_be32(pb, FrameRate);
- put_be16(pb, VideoCodec->width);
- put_be16(pb, VideoCodec->height);
- put_be32(pb, 0x010001); /* ? */
-}
-
-static int mov_write_header(AVFormatContext *s)
-{
- ByteIOContext *pb = s->pb;
- MOVContext *mov = s->priv_data;
- int i;
-
- if (url_is_streamed(s->pb)) {
- av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n");
- return -1;
- }
-
- /* Default mode == MP4 */
- mov->mode = MODE_MP4;
-
- if (s->oformat != NULL) {
- if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP;
- else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3G2;
- else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;
- else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP;
-
- mov_write_ftyp_tag(pb,s);
- if ( mov->mode == MODE_PSP ) {
- if ( s->nb_streams != 2 ) {
- av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
- return -1;
- }
- mov_write_uuidprof_tag(pb,s);
- }
- }
-
- for(i=0; i<s->nb_streams; i++){
- AVStream *st= s->streams[i];
- MOVTrack *track= &mov->tracks[i];
-
- track->enc = st->codec;
- track->language = ff_mov_iso639_to_lang(st->language, mov->mode != MODE_MOV);
- track->mode = mov->mode;
- if(st->codec->codec_type == CODEC_TYPE_VIDEO){
- track->tag = mov_find_video_codec_tag(s, track);
- track->timescale = st->codec->time_base.den;
- av_set_pts_info(st, 64, 1, st->codec->time_base.den);
- if (track->timescale > 100000)
- av_log(NULL, AV_LOG_WARNING,
- "WARNING codec timebase is very high. If duration is too long,\n"
- "file may not be playable by quicktime. Specify a shorter timebase\n"
- "or choose different container.\n");
- }else if(st->codec->codec_type == CODEC_TYPE_AUDIO){
- track->tag = mov_find_audio_codec_tag(s, track);
- track->timescale = st->codec->sample_rate;
- av_set_pts_info(st, 64, 1, st->codec->sample_rate);
- if(!st->codec->frame_size){
- av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i);
- return -1;
- }else if(st->codec->frame_size > 1){ /* assume compressed audio */
- track->audio_vbr = 1;
- }else{
- track->sampleSize = (av_get_bits_per_sample(st->codec->codec_id) >> 3) * st->codec->channels;
- }
- }
- }
-
- mov_write_mdat_tag(pb, mov);
- mov->time = s->timestamp + 0x7C25B080; //1970 based -> 1904 based
- mov->nb_streams = s->nb_streams;
-
- put_flush_packet(pb);
-
- return 0;
-}
-
-static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
- MOVContext *mov = s->priv_data;
- ByteIOContext *pb = s->pb;
- MOVTrack *trk = &mov->tracks[pkt->stream_index];
- AVCodecContext *enc = trk->enc;
- unsigned int samplesInChunk = 0;
- int size= pkt->size;
-
- if (url_is_streamed(s->pb)) return 0; /* Can't handle that */
- if (!size) return 0; /* Discard 0 sized packets */
-
- if (enc->codec_id == CODEC_ID_AMR_NB) {
- /* We must find out how many AMR blocks there are in one packet */
- static uint16_t packed_size[16] =
- {13, 14, 16, 18, 20, 21, 27, 32, 6, 0, 0, 0, 0, 0, 0, 0};
- int len = 0;
-
- while (len < size && samplesInChunk < 100) {
- len += packed_size[(pkt->data[len] >> 3) & 0x0F];
- samplesInChunk++;
- }
- if(samplesInChunk > 1){
- av_log(s, AV_LOG_ERROR, "fatal error, input is not a single packet, implement a AVParser for it\n");
- return -1;
- }
- } else if (trk->sampleSize)
- samplesInChunk = size/trk->sampleSize;
- else
- samplesInChunk = 1;
-
- /* copy extradata if it exists */
- if (trk->vosLen == 0 && enc->extradata_size > 0) {
- trk->vosLen = enc->extradata_size;
- trk->vosData = av_malloc(trk->vosLen);
- memcpy(trk->vosData, enc->extradata, trk->vosLen);
- }
-
- if (enc->codec_id == CODEC_ID_H264 && trk->vosLen > 0 && *(uint8_t *)trk->vosData != 1) {
- /* from x264 or from bytestream h264 */
- /* nal reformating needed */
- int ret = avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size);
- if (ret < 0)
- return ret;
- assert(pkt->size);
- size = pkt->size;
- } else if (enc->codec_id == CODEC_ID_DNXHD && !trk->vosLen) {
- /* copy frame header to create needed atoms */
- if (size < 640)
- return -1;
- trk->vosLen = 640;
- trk->vosData = av_malloc(trk->vosLen);
- memcpy(trk->vosData, pkt->data, 640);
- }
-
- if (!(trk->entry % MOV_INDEX_CLUSTER_SIZE)) {
- trk->cluster = av_realloc(trk->cluster, (trk->entry + MOV_INDEX_CLUSTER_SIZE) * sizeof(*trk->cluster));
- if (!trk->cluster)
- return -1;
- }
-
- trk->cluster[trk->entry].pos = url_ftell(pb);
- trk->cluster[trk->entry].samplesInChunk = samplesInChunk;
- trk->cluster[trk->entry].size = size;
- trk->cluster[trk->entry].entries = samplesInChunk;
- trk->cluster[trk->entry].dts = pkt->dts;
- trk->trackDuration = pkt->dts - trk->cluster[0].dts + pkt->duration;
-
- if(enc->codec_type == CODEC_TYPE_VIDEO) {
- if (pkt->dts != pkt->pts)
- trk->hasBframes = 1;
- trk->cluster[trk->entry].cts = pkt->pts - pkt->dts;
- trk->cluster[trk->entry].key_frame = !!(pkt->flags & PKT_FLAG_KEY);
- if(trk->cluster[trk->entry].key_frame)
- trk->hasKeyframes++;
- }
- trk->entry++;
- trk->sampleCount += samplesInChunk;
- mov->mdat_size += size;
-
- put_buffer(pb, pkt->data, size);
-
- put_flush_packet(pb);
- return 0;
-}
-
-static int mov_write_trailer(AVFormatContext *s)
-{
- MOVContext *mov = s->priv_data;
- ByteIOContext *pb = s->pb;
- int res = 0;
- int i;
-
- offset_t moov_pos = url_ftell(pb);
-
- /* Write size of mdat tag */
- if (mov->mdat_size+8 <= UINT32_MAX) {
- url_fseek(pb, mov->mdat_pos, SEEK_SET);
- put_be32(pb, mov->mdat_size+8);
- } else {
- /* overwrite 'wide' placeholder atom */
- url_fseek(pb, mov->mdat_pos - 8, SEEK_SET);
- put_be32(pb, 1); /* special value: real atom size will be 64 bit value after tag field */
- put_tag(pb, "mdat");
- put_be64(pb, mov->mdat_size+16);
- }
- url_fseek(pb, moov_pos, SEEK_SET);
-
- mov_write_moov_tag(pb, mov, s);
-
- for (i=0; i<mov->nb_streams; i++) {
- av_freep(&mov->tracks[i].cluster);
-
- if( mov->tracks[i].vosLen ) av_free( mov->tracks[i].vosData );
-
- }
-
- put_flush_packet(pb);
-
- return res;
-}
-
-#ifdef CONFIG_MOV_MUXER
-AVOutputFormat mov_muxer = {
- "mov",
- "mov format",
- NULL,
- "mov",
- sizeof(MOVContext),
- CODEC_ID_AAC,
- CODEC_ID_MPEG4,
- mov_write_header,
- mov_write_packet,
- mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER,
-};
-#endif
-#ifdef CONFIG_TGP_MUXER
-AVOutputFormat tgp_muxer = {
- "3gp",
- "3gp format",
- NULL,
- "3gp",
- sizeof(MOVContext),
- CODEC_ID_AMR_NB,
- CODEC_ID_H263,
- mov_write_header,
- mov_write_packet,
- mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER,
-};
-#endif
-#ifdef CONFIG_MP4_MUXER
-AVOutputFormat mp4_muxer = {
- "mp4",
- "mp4 format",
- "application/mp4",
- "mp4,m4a",
- sizeof(MOVContext),
- CODEC_ID_AAC,
- CODEC_ID_MPEG4,
- mov_write_header,
- mov_write_packet,
- mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER,
-};
-#endif
-#ifdef CONFIG_PSP_MUXER
-AVOutputFormat psp_muxer = {
- "psp",
- "psp mp4 format",
- NULL,
- "mp4,psp",
- sizeof(MOVContext),
- CODEC_ID_AAC,
- CODEC_ID_MPEG4,
- mov_write_header,
- mov_write_packet,
- mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER,
-};
-#endif
-#ifdef CONFIG_TG2_MUXER
-AVOutputFormat tg2_muxer = {
- "3g2",
- "3gp2 format",
- NULL,
- "3g2",
- sizeof(MOVContext),
- CODEC_ID_AMR_NB,
- CODEC_ID_H263,
- mov_write_header,
- mov_write_packet,
- mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER,
-};
-#endif
Added: trunk/libavformat/avc.h
==============================================================================
--- (empty file)
+++ trunk/libavformat/avc.h Fri Jan 11 02:24:55 2008
@@ -0,0 +1,31 @@
+/*
+ * AVC helper functions for muxers
+ * Copyright (c) 2008 Aurelien Jacobs <aurel at gnuage.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVC_H
+#define AVC_H
+
+#include <stdint.h>
+#include "avio.h"
+
+int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size);
+int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len);
+
+#endif /* AVC_H */
Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c (original)
+++ trunk/libavformat/movenc.c Fri Jan 11 02:24:55 2008
@@ -23,6 +23,7 @@
#include "riff.h"
#include "avio.h"
#include "isom.h"
+#include "avc.h"
#undef NDEBUG
#include <assert.h>
@@ -415,119 +416,6 @@ static int mov_write_svq3_tag(ByteIOCont
return 0x15;
}
-static uint8_t *avc_find_startcode( uint8_t *p, uint8_t *end )
-{
- uint8_t *a = p + 4 - ((long)p & 3);
-
- for( end -= 3; p < a && p < end; p++ ) {
- if( p[0] == 0 && p[1] == 0 && p[2] == 1 )
- return p;
- }
-
- for( end -= 3; p < end; p += 4 ) {
- uint32_t x = *(uint32_t*)p;
-// if( (x - 0x01000100) & (~x) & 0x80008000 ) // little endian
-// if( (x - 0x00010001) & (~x) & 0x00800080 ) // big endian
- if( (x - 0x01010101) & (~x) & 0x80808080 ) { // generic
- if( p[1] == 0 ) {
- if( p[0] == 0 && p[2] == 1 )
- return p-1;
- if( p[2] == 0 && p[3] == 1 )
- return p;
- }
- if( p[3] == 0 ) {
- if( p[2] == 0 && p[4] == 1 )
- return p+1;
- if( p[4] == 0 && p[5] == 1 )
- return p+2;
- }
- }
- }
-
- for( end += 3; p < end; p++ ) {
- if( p[0] == 0 && p[1] == 0 && p[2] == 1 )
- return p;
- }
-
- return end + 3;
-}
-
-static int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
-{
- ByteIOContext *pb;
- uint8_t *p = buf_in;
- uint8_t *end = p + *size;
- uint8_t *nal_start, *nal_end;
- int ret = url_open_dyn_buf(&pb);
- if(ret < 0)
- return ret;
-
- nal_start = avc_find_startcode(p, end);
- while (nal_start < end) {
- while(!*(nal_start++));
- nal_end = avc_find_startcode(nal_start, end);
- put_be32(pb, nal_end - nal_start);
- put_buffer(pb, nal_start, nal_end - nal_start);
- nal_start = nal_end;
- }
- av_freep(buf);
- *size = url_close_dyn_buf(pb, buf);
- return 0;
-}
-
-static int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)
-{
- if (len > 6) {
- /* check for h264 start code */
- if (AV_RB32(data) == 0x00000001) {
- uint8_t *buf=NULL, *end;
- uint32_t sps_size=0, pps_size=0;
- uint8_t *sps=0, *pps=0;
-
- int ret = avc_parse_nal_units(data, &buf, &len);
- if (ret < 0)
- return ret;
- data = buf;
- end = buf + len;
-
- /* look for sps and pps */
- while (buf < end) {
- unsigned int size;
- uint8_t nal_type;
- size = AV_RB32(buf);
- nal_type = buf[4] & 0x1f;
- if (nal_type == 7) { /* SPS */
- sps = buf + 4;
- sps_size = size;
- } else if (nal_type == 8) { /* PPS */
- pps = buf + 4;
- pps_size = size;
- }
- buf += size + 4;
- }
- assert(sps);
- assert(pps);
-
- put_byte(pb, 1); /* version */
- put_byte(pb, sps[1]); /* profile */
- put_byte(pb, sps[2]); /* profile compat */
- put_byte(pb, sps[3]); /* level */
- put_byte(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */
- put_byte(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */
-
- put_be16(pb, sps_size);
- put_buffer(pb, sps, sps_size);
- put_byte(pb, 1); /* number of pps */
- put_be16(pb, pps_size);
- put_buffer(pb, pps, pps_size);
- av_free(data);
- } else {
- put_buffer(pb, data, len);
- }
- }
- return 0;
-}
-
static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)
{
offset_t pos = url_ftell(pb);
More information about the ffmpeg-cvslog
mailing list