*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
#include "avi.h"
#include "avio.h"
+#include "mov.h"
#undef NDEBUG
#include <assert.h>
#define MODE_3G2 4
typedef struct MOVIentry {
- unsigned int flags, pos, size;
+ unsigned int flags, size;
+ uint64_t pos;
unsigned int samplesInChunk;
char key_frame;
unsigned int entries;
+ int64_t cts;
} MOVIentry;
typedef struct MOVIndex {
int mode;
int entry;
- int mdat_size;
+ uint64_t mdat_size;
int ents_allocated;
long timescale;
long time;
- long trackDuration;
+ int64_t trackDuration;
long sampleCount;
long sampleDuration;
int hasKeyframes;
+ int hasBframes;
+ int language;
int trackID;
AVCodecContext *enc;
typedef struct MOVContext {
int mode;
- long time;
+ int64_t time;
int nb_streams;
int mdat_written;
offset_t mdat_pos;
static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track);
-const CodecTag ff_mov_obj_type[] = {
- { CODEC_ID_MPEG4 , 32 },
- { CODEC_ID_AAC , 64 },
- { CODEC_ID_MPEG1VIDEO, 106 },
- { CODEC_ID_MPEG2VIDEO, 96 },//mpeg2 profiles
- { CODEC_ID_MP2 , 107 },//FIXME mpeg2 mpeg audio -> 105
- { CODEC_ID_MP3 , 107 },//FIXME mpeg2 mpeg audio -> 105
- { CODEC_ID_H264 , 33 },
- { CODEC_ID_H263 , 242 },
- { CODEC_ID_H261 , 243 },
- { CODEC_ID_MJPEG , 108 },
- { CODEC_ID_PCM_S16LE , 224 },
- { CODEC_ID_VORBIS , 225 },
- { CODEC_ID_AC3 , 226 },
- { CODEC_ID_PCM_ALAW , 227 },
- { CODEC_ID_PCM_MULAW , 228 },
- { CODEC_ID_PCM_S16BE , 230 },
- { 0,0 },
-};
+/* output language code from iso639 language name */
+extern int ff_mov_iso639_to_lang(const char *lang, int mp4);
//FIXME supprt 64bit varaint with wide placeholders
-static int updateSize (ByteIOContext *pb, int pos)
+static offset_t updateSize (ByteIOContext *pb, offset_t pos)
{
- long curpos = url_ftell(pb);
+ 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);
static int mov_write_stco_tag(ByteIOContext *pb, MOVTrack* track)
{
int i;
- int pos = url_ftell(pb);
+ int mode64 = 0; // use 32 bit size variant if possible
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
- put_tag(pb, "stco");
+ 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++) {
int cl = i / MOV_INDEX_CLUSTER_SIZE;
int id = i % MOV_INDEX_CLUSTER_SIZE;
- put_be32(pb, track->cluster[cl][id].pos);
+ if(mode64 == 1)
+ put_be64(pb, track->cluster[cl][id].pos);
+ else
+ put_be32(pb, track->cluster[cl][id].pos);
}
return updateSize (pb, pos);
}
int equalChunks = 1;
int i, j, entries = 0, tst = -1, oldtst = -1;
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stsz");
put_be32(pb, 0); /* version & flags */
/* Sample to chunk atom */
static int mov_write_stsc_tag(ByteIOContext *pb, MOVTrack* track)
{
- int index = 0, oldval = -1, i, entryPos, curpos;
+ int index = 0, oldval = -1, i;
+ offset_t entryPos, curpos;
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stsc");
put_be32(pb, 0); // version & flags
/* Sync sample atom */
static int mov_write_stss_tag(ByteIOContext *pb, MOVTrack* track)
{
- long curpos;
- int i, index = 0, entryPos;
- int pos = url_ftell(pb);
+ 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
static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "wave");
{ CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') },
{ CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') },
{ CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') },
- { 0, 0 },
+ { CODEC_ID_NONE, 0 },
};
static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
int tag;
put_be32(pb, 0); /* size */
return 0x15;
}
+static uint8_t *avc_find_startcode( uint8_t *p, uint8_t *end )
+{
+ uint8_t *a = p + 4 - ((int)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;
+ if( p[2] == 0 && p[3] == 1 )
+ return p+1;
+ }
+ if( p[3] == 0 ) {
+ if( p[2] == 0 && p[4] == 1 )
+ return p+2;
+ if( p[4] == 0 && p[5] == 1 )
+ return p+3;
+ }
+ }
+ }
+
+ for( end += 3; p < end; p++ ) {
+ if( p[0] == 0 && p[1] == 0 && p[2] == 1 )
+ return p;
+ }
+
+ return end + 3;
+}
+
+static void avc_parse_nal_units(uint8_t **buf, int *size)
+{
+ ByteIOContext pb;
+ uint8_t *p = *buf;
+ uint8_t *end = p + *size;
+ uint8_t *nal_start, *nal_end;
+
+ url_open_dyn_buf(&pb);
+ 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);
+}
+
+static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)
+{
+ offset_t pos = url_ftell(pb);
+
+ put_be32(pb, 0);
+ put_tag(pb, "avcC");
+ if (track->vosLen > 6) {
+ /* check for h264 start code */
+ if (BE_32(track->vosData) == 0x00000001) {
+ uint8_t *buf, *end;
+ uint32_t sps_size=0, pps_size=0;
+ uint8_t *sps=0, *pps=0;
+
+ avc_parse_nal_units(&track->vosData, &track->vosLen);
+ buf = track->vosData;
+ end = track->vosData + track->vosLen;
+
+ put_byte(pb, 1); /* version */
+ put_byte(pb, 77); /* profile */
+ put_byte(pb, 64); /* profile compat */
+ put_byte(pb, 30); /* 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) */
+
+ /* look for sps and pps */
+ while (buf < end) {
+ unsigned int size;
+ uint8_t nal_type;
+ size = BE_32(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_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);
+ } else {
+ put_buffer(pb, track->vosData, track->vosLen);
+ }
+ }
+ return updateSize(pb, pos);
+}
+
static unsigned int descrLength(unsigned int len)
{
if (len < 0x00000080)
static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
{
int decoderSpecificInfoLen;
- int pos = url_ftell(pb);
- void *vosDataBackup=track->vosData;
- int vosLenBackup=track->vosLen;
-
- // we should be able to have these passed in, via vosData, then we wouldn't need to attack this routine at all
- static const char PSPAACData[]={0x13,0x10};
- static const char PSPMP4Data[]={0x00,0x00,0x01,0xB0,0x03,0x00,0x00,0x01,0xB5,0x09,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x20,0x00,0x84,0x5D,0x4C,0x28,0x50,0x20,0xF0,0xA3,0x1F };
-
-
- if (track->mode == MODE_PSP) // fails on psp if this is not here
- {
- if (track->enc->codec_id == CODEC_ID_AAC)
- {
- track->vosLen = 2;
- track->vosData = (uint8_t *) PSPAACData;
- }
-
- if (track->enc->codec_id == CODEC_ID_MPEG4)
- {
- track->vosLen = 28;
- track->vosData = (uint8_t *) PSPMP4Data;
- }
- }
+ offset_t pos = url_ftell(pb);
decoderSpecificInfoLen = track->vosLen ? descrLength(track->vosLen):0;
put_buffer(pb, track->vosData, track->vosLen);
}
- track->vosData = vosDataBackup;
- track->vosLen = vosLenBackup;
// SL descriptor
putDescr(pb, 0x06, 1);
{ CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
{ CODEC_ID_H263, MKTAG('s', '2', '6', '3') },
{ CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') },
- { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') },
- { 0, 0 },
+ /* special handling in mov_find_video_codec_tag */
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL */
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC */
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL */
+ { CODEC_ID_NONE, 0 },
};
-static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
+static int mov_find_video_codec_tag(MOVTrack* track)
{
- int pos = url_ftell(pb);
- char compressor_name[32];
int tag;
- put_be32(pb, 0); /* size */
-
tag = track->enc->codec_tag;
- if (!tag)
- tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
+ 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 {
+ 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);
+ assert(tag);
+ return tag;
+}
+
+static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
+{
+ offset_t pos = url_ftell(pb);
+ char compressor_name[32];
+ int tag;
+
+ put_be32(pb, 0); /* size */
+
+ tag = mov_find_video_codec_tag(track);
put_le32(pb, tag); // store it byteswapped
put_be32(pb, 0); /* Reserved */
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);
return updateSize (pb, pos);
}
static int mov_write_stsd_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stsd");
put_be32(pb, 0); /* version & flags */
return updateSize(pb, pos);
}
+static int mov_write_ctts_tag(ByteIOContext *pb, MOVTrack* track)
+{
+ Time2Sample *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][0].cts;
+ for (i=1; i<track->entry; i++) {
+ int cl = i / MOV_INDEX_CLUSTER_SIZE;
+ int id = i % MOV_INDEX_CLUSTER_SIZE;
+ if (track->cluster[cl][id].cts == ctts_entries[entries].duration) {
+ ctts_entries[entries].count++; /* compress */
+ } else {
+ entries++;
+ ctts_entries[entries].duration = track->cluster[cl][id].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;
+}
+
/* TODO: */
/* Time to sample atom */
static int mov_write_stts_tag(ByteIOContext *pb, MOVTrack* track)
static int mov_write_stbl_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "stbl");
mov_write_stsd_tag(pb, track);
if (track->enc->codec_type == CODEC_TYPE_VIDEO &&
track->hasKeyframes)
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);
static int mov_write_dinf_tag(ByteIOContext *pb)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "dinf");
mov_write_dref_tag(pb);
static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track)
{
char *descr, *hdlr, *hdlr_type;
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
if (!track) { /* no media --> data handler */
hdlr = "dhlr";
static int mov_write_minf_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "minf");
if(track->enc->codec_type == CODEC_TYPE_VIDEO)
static int mov_write_mdhd_tag(ByteIOContext *pb, MOVTrack* track)
{
- put_be32(pb, 32); /* size */
+ int version = track->trackDuration < INT32_MAX ? 0 : 1;
+
+ (version == 1) ? put_be32(pb, 44) : put_be32(pb, 32); /* size */
put_tag(pb, "mdhd");
- put_be32(pb, 0); /* Version & flags */
- put_be32(pb, track->time); /* creation time */
- put_be32(pb, track->time); /* modification time */
+ 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) */
- put_be32(pb, track->trackDuration); /* duration */
- put_be16(pb, 0); /* language, 0 = english */
+ (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) */
return 32;
}
static int mov_write_mdia_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "mdia");
mov_write_mdhd_tag(pb, track);
static int mov_write_tkhd_tag(ByteIOContext *pb, MOVTrack* track)
{
- put_be32(pb, 0x5c); /* size (always 0x5c) */
+ 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_be32(pb, 0xf); /* version & flags (track enabled) */
- put_be32(pb, track->time); /* creation time */
- put_be32(pb, track->time); /* modification time */
+ 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 */
- put_be32(pb, av_rescale_rnd(track->trackDuration, globalTimescale, track->timescale, AV_ROUND_UP)); /* duration */
+ (version == 1) ? put_be64(pb, duration) : put_be32(pb, duration);
put_be32(pb, 0); /* reserved */
put_be32(pb, 0); /* reserved */
put_be32(pb, av_rescale_rnd(track->trackDuration, globalTimescale, track->timescale, AV_ROUND_UP)); /* duration ... doesn't seem to effect psp */
- put_be32(pb, 0x0);
+ put_be32(pb, track->sampleDuration);
put_be32(pb, 0x00010000);
return 0x24;
}
static int mov_write_trak_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ 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)
+ 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)
static int mov_write_mvhd_tag(ByteIOContext *pb, MOVContext *mov)
{
- int maxTrackID = 1, maxTrackLen = 0, i;
- int64_t maxTrackLenTemp;
+ int maxTrackID = 1, i;
+ int64_t maxTrackLenTemp, maxTrackLen = 0;
+ int version;
- put_be32(pb, 0x6c); /* size (always 0x6c) */
- put_tag(pb, "mvhd");
- put_be32(pb, 0); /* version & flags */
- put_be32(pb, mov->time); /* creation time */
- put_be32(pb, mov->time); /* modification time */
- put_be32(pb, mov->timescale); /* timescale */
for (i=0; i<MAX_STREAMS; i++) {
if(mov->tracks[i].entry > 0) {
maxTrackLenTemp = av_rescale_rnd(mov->tracks[i].trackDuration, globalTimescale, mov->tracks[i].timescale, AV_ROUND_UP);
maxTrackID = mov->tracks[i].trackID;
}
}
- put_be32(pb, maxTrackLen); /* duration of longest track */
+
+ 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 */
static int mov_write_itunes_hdlr_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "hdlr");
put_be32(pb, 0);
static int mov_write_string_data_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s, const char *data)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "data");
put_be32(pb, 1);
{
int size = 0;
if ( s->title[0] ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251nam");
mov_write_string_data_tag(pb, mov, s, s->title);
{
int size = 0;
if ( s->author[0] ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251ART");
// we use the author here as this is the only thing that we have...
{
int size = 0;
if ( s->author[0] ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251wrt");
mov_write_string_data_tag(pb, mov, s, s->author);
{
int size = 0;
if ( s->album[0] ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251alb");
mov_write_string_data_tag(pb, mov, s, s->album);
char year[5];
int size = 0;
if ( s->year ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251day");
snprintf(year, 5, "%04d", s->year);
static int mov_write_too_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251too");
mov_write_string_data_tag(pb, mov, s, LIBAVFORMAT_IDENT);
{
int size = 0;
if ( s->comment[0] ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251cmt");
mov_write_string_data_tag(pb, mov, s, s->comment);
{
int size = 0;
if ( s->genre[0] ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251gen");
mov_write_string_data_tag(pb, mov, s, s->genre);
{
int size = 0;
if ( s->track ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "trkn");
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "data");
put_be32(pb, 0); // 8 bytes empty
static int mov_write_ilst_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "ilst");
mov_write_nam_tag(pb, mov, s);
// 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 ) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "meta");
put_be32(pb, 0);
static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
AVFormatContext *s)
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
int i;
put_be32(pb, 0); /* size */
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) {
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251req");
put_be16(pb, sizeof("QuickTime 6.0 or greater") - 1);
/* Encoder */
if(mov->tracks[0].enc && !(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT))
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251enc");
put_be16(pb, sizeof(LIBAVFORMAT_IDENT) - 1); /* string length */
if( s->title[0] )
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251nam");
put_be16(pb, strlen(s->title)); /* string length */
if( s->author[0] )
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, /*"\251aut"*/ "\251day" );
put_be16(pb, strlen(s->author)); /* string length */
if( s->comment[0] )
{
- int pos = url_ftell(pb);
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size */
put_tag(pb, "\251des");
put_be16(pb, strlen(s->comment)); /* string length */
return updateSize(pb, pos);
}
+
+static size_t ascii_to_wc (ByteIOContext *pb, char *b, size_t n)
+{
+ size_t i;
+ unsigned char c;
+ for (i = 0; i < n - 1; i++) {
+ c = b[i];
+ if (! (0x20 <= c && c <= 0x7f ))
+ c = 0x3f; /* '?' */
+ put_be16(pb, c);
+ }
+ put_be16(pb, 0x00);
+ return 2*n;
+}
+
+static uint16_t language_code (char *str)
+{
+ return ((((str[0]-'a') & 0x1F)<<10) + (((str[1]-'a') & 0x1F)<<5) + ((str[2]-'a') & 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, 1);
+ size += 10;
+
+ // Title
+ len = strlen(s->title)+1;
+ put_be16(pb, len*2+10); /* size */
+ put_be32(pb, 0x01); /* type */
+ put_be16(pb, language_code("und")); /* language */
+ put_be16(pb, 0x01); /* ? */
+ ascii_to_wc (pb, s->title, len);
+ 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;
+}
+
static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov,
AVFormatContext *s)
{
- int pos, i;
- pos = url_ftell(pb);
+ int i;
+ offset_t pos = url_ftell(pb);
put_be32(pb, 0); /* size placeholder*/
put_tag(pb, "moov");
mov->timescale = globalTimescale;
}
mov->tracks[i].trackDuration =
- mov->tracks[i].sampleCount * mov->tracks[i].sampleDuration;
+ (int64_t)mov->tracks[i].sampleCount * mov->tracks[i].sampleDuration;
mov->tracks[i].time = mov->time;
mov->tracks[i].trackID = i+1;
}
}
}
+ if (mov->mode == MODE_PSP)
+ mov_write_uuidusmt_tag(pb, s);
+ else
mov_write_udta_tag(pb, mov, s);
return updateSize(pb, pos);
int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov)
{
+ put_be32(pb, 8); // placeholder for extended size field (64 bit)
+ put_tag(pb, "wide");
+
mov->mdat_pos = url_ftell(pb);
put_be32(pb, 0); /* size placeholder*/
put_tag(pb, "mdat");
}
/* TODO: This needs to be more general */
-int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
+static void mov_write_ftyp_tag (ByteIOContext *pb, AVFormatContext *s)
{
MOVContext *mov = s->priv_data;
put_tag(pb, "3g2a");
else if ( mov->mode == MODE_PSP )
put_tag(pb, "MSNV");
- else
+ else if ( mov->mode == MODE_MP4 )
put_tag(pb, "isom");
+ else
+ put_tag(pb, "qt ");
put_be32(pb, 0x200 );
put_tag(pb, "3g2a");
else if ( mov->mode == MODE_PSP )
put_tag(pb, "MSNV");
- else
+ else if ( mov->mode == MODE_MP4 )
put_tag(pb, "mp41");
-
- return 0x14;
+ else
+ put_tag(pb, "qt ");
}
static void mov_write_uuidprof_tag(ByteIOContext *pb, AVFormatContext *s)
{
- int AudioRate = s->streams[1]->codec->sample_rate;
- int FrameRate = ((s->streams[0]->codec->time_base.den) * (0x10000))/ (s->streams[0]->codec->time_base.num);
-
- //printf("audiorate = %d\n",AudioRate);
- //printf("framerate = %d / %d = 0x%x\n",s->streams[0]->codec->time_base.den,s->streams[0]->codec->time_base.num,FrameRate);
+ 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);
put_be32(pb, 0x94 ); /* size */
put_tag(pb, "uuid");
put_be32(pb, 0x2c ); /* size */
put_tag(pb, "APRF"); /* audio */
put_be32(pb, 0x0 );
- put_be32(pb, 0x2 );
+ put_be32(pb, 0x2 ); /* TrackID */
put_tag(pb, "mp4a");
put_be32(pb, 0x20f );
put_be32(pb, 0x0 );
- put_be32(pb, 0x40 );
- put_be32(pb, 0x40 );
- put_be32(pb, AudioRate ); //24000 ... audio rate?
- put_be32(pb, 0x2 );
+ put_be32(pb, AudioCodec->bit_rate / 1000);
+ put_be32(pb, AudioCodec->bit_rate / 1000);
+ 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 );
+ put_be32(pb, 0x1 ); /* TrackID */
put_tag(pb, "mp4v");
put_be32(pb, 0x103 );
put_be32(pb, 0x0 );
- put_be32(pb, 0xc0 );
- put_be32(pb, 0xc0 );
- put_be32(pb, FrameRate); // was 0xefc29
- put_be32(pb, FrameRate ); // was 0xefc29
- put_be16(pb, s->streams[0]->codec->width);
- put_be16(pb, s->streams[0]->codec->height);
- put_be32(pb, 0x010001 );
+ put_be32(pb, VideoCodec->bit_rate / 1000);
+ put_be32(pb, VideoCodec->bit_rate / 1000);
+ 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)
MOVContext *mov = s->priv_data;
int i;
+ /* 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++){
AVCodecContext *c= s->streams[i]->codec;
- if (c->codec_type == CODEC_TYPE_VIDEO){
+ if(c->codec_type == CODEC_TYPE_VIDEO){
+ av_set_pts_info(s->streams[i], 64, 1, c->time_base.den);
if (!codec_get_tag(codec_movvideo_tags, c->codec_id)){
if(!codec_get_tag(codec_bmp_tags, c->codec_id))
return -1;
av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, the file may be unplayable!\n");
}
}else if(c->codec_type == CODEC_TYPE_AUDIO){
+ av_set_pts_info(s->streams[i], 64, 1, c->sample_rate);
if (!codec_get_tag(codec_movaudio_tags, c->codec_id)){
if(!codec_get_tag(codec_wav_tags, c->codec_id))
return -1;
av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, the file may be unplayable!\n");
}
}
- }
-
- /* 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;
-
- if ( mov->mode == MODE_3GP || mov->mode == MODE_3G2 ||
- mov->mode == MODE_MP4 || 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);
- }
+ mov->tracks[i].language = ff_mov_iso639_to_lang(s->streams[i]->language, mov->mode != MODE_MOV);
}
for (i=0; i<MAX_STREAMS; i++) {
memcpy(trk->vosData, enc->extradata, trk->vosLen);
}
+ if (enc->codec_id == CODEC_ID_H264) {
+ if (trk->vosLen == 0) {
+ /* copy extradata */
+ trk->vosLen = enc->extradata_size;
+ trk->vosData = av_malloc(trk->vosLen);
+ memcpy(trk->vosData, enc->extradata, trk->vosLen);
+ }
+ if (*(uint8_t *)trk->vosData != 1) {
+ /* from x264 or from bytestream h264 */
+ /* nal reformating needed */
+ avc_parse_nal_units(&pkt->data, &pkt->size);
+ assert(pkt->size);
+ size = pkt->size;
+ }
+ }
+
cl = trk->entry / MOV_INDEX_CLUSTER_SIZE;
id = trk->entry % MOV_INDEX_CLUSTER_SIZE;
trk->cluster[cl][id].size = size;
trk->cluster[cl][id].entries = samplesInChunk;
if(enc->codec_type == CODEC_TYPE_VIDEO) {
+ if (pkt->dts != pkt->pts)
+ trk->hasBframes = 1;
+ trk->cluster[cl][id].cts = pkt->pts - pkt->dts;
trk->cluster[cl][id].key_frame = !!(pkt->flags & PKT_FLAG_KEY);
if(trk->cluster[cl][id].key_frame)
trk->hasKeyframes = 1;
MOVContext *mov = s->priv_data;
ByteIOContext *pb = &s->pb;
int res = 0;
- int i, j;
+ int i;
+ uint64_t j;
offset_t moov_pos = url_ftell(pb);
j += mov->tracks[i].mdat_size;
}
}
- url_fseek(pb, mov->mdat_pos, SEEK_SET);
- put_be32(pb, j+8);
+ if (j+8 <= UINT32_MAX) {
+ url_fseek(pb, mov->mdat_pos, SEEK_SET);
+ put_be32(pb, j+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, j+16);
+ }
url_fseek(pb, moov_pos, SEEK_SET);
mov_write_moov_tag(pb, mov, s);
mov_write_header,
mov_write_packet,
mov_write_trailer,
-// .flags = AVFMT_GLOBALHEADER,
+ .flags = AVFMT_GLOBALHEADER,
};
static AVOutputFormat _3g2_oformat = {
projects / ffmpeg / blobdiff