return updateSize (pb, pos);
}
+const CodecTag codec_movaudio_tags[] = {
+ { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') },
+ { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') },
+ { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') },
+ { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') },
+ { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') },
+ { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') },
+ { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') },
+ { 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 },
+};
+
static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ int pos = url_ftell(pb), tag;
+
put_be32(pb, 0); /* size */
- if(track->enc->codec_id == CODEC_ID_PCM_MULAW)
- put_tag(pb, "ulaw");
- else if(track->enc->codec_id == CODEC_ID_PCM_ALAW)
- put_tag(pb, "alaw");
- else if(track->enc->codec_id == CODEC_ID_ADPCM_IMA_QT)
- put_tag(pb, "ima4");
- else if(track->enc->codec_id == CODEC_ID_MACE3)
- put_tag(pb, "MAC3");
- else if(track->enc->codec_id == CODEC_ID_MACE6)
- put_tag(pb, "MAC6");
- else if(track->enc->codec_id == CODEC_ID_AAC)
- put_tag(pb, "mp4a");
- else if(track->enc->codec_id == CODEC_ID_AMR_NB)
- put_tag(pb, "samr");
+ tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id);
+ // if no mac fcc found, try with Microsoft tags
+ if (!tag)
+ {
+ int tmp = codec_get_tag(codec_wav_tags, track->enc->codec_id);
+ if (tmp)
+ tag = MKTAG('m', 's', ((tmp >> 8) & 0xff), (tmp & 0xff));
+ }
+ if (!tag)
+ put_tag(pb, " ");
else
- put_tag(pb, " ");
+ put_le32(pb, tag); // store it byteswapped
put_be32(pb, 0); /* Reserved */
put_be16(pb, 0); /* Reserved */
/* TODO: Currently hard-coded to 16-bit, there doesn't seem
to be a good way to get number of bits of audio */
put_be16(pb, 0x10); /* Reserved */
- put_be16(pb, 0xfffe); /* compression ID (= 0) */
- put_be16(pb, 0xac); /* packet size (= 0) */
+ put_be16(pb, 0); /* compression ID (= 0) */
+ put_be16(pb, 0); /* packet size (= 0) */
put_be16(pb, track->timescale); /* Time scale */
put_be16(pb, 0); /* Reserved */
return updateSize (pb, pos);
}
+const CodecTag codec_movvideo_tags[] = {
+ { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') },
+ { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') },
+ { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
+ { CODEC_ID_H263, MKTAG('s', '2', '6', '3') },
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') },
+ { 0, 0 },
+};
+
static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
{
- int pos = url_ftell(pb);
+ int pos = url_ftell(pb), tag;
+
put_be32(pb, 0); /* size */
- if(track->enc->codec_id == CODEC_ID_SVQ1)
- put_tag(pb, "SVQ1");
- else if(track->enc->codec_id == CODEC_ID_SVQ3)
- put_tag(pb, "SVQ3");
- else if(track->enc->codec_id == CODEC_ID_MPEG4)
- put_tag(pb, "mp4v");
- else if(track->enc->codec_id == CODEC_ID_H263)
- put_tag(pb, "s263");
+
+ 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)
+ put_tag(pb, " ");
else
- put_tag(pb, " "); /* Unknown tag */
+ put_le32(pb, tag); // store it byteswapped
put_be32(pb, 0); /* Reserved */
put_be16(pb, 0); /* Reserved */
put_be16(pb, track->enc->height); /* Video height */
put_be32(pb, 0x00480000); /* Reserved */
put_be32(pb, 0x00480000); /* Reserved */
+ put_be32(pb, 0); /* Data size (= 0) */
+ put_be16(pb, 1); /* Frame count (= 1) */
+
put_be32(pb, 0); /* Reserved */
put_be32(pb, 0); /* Reserved */
put_be32(pb, 0); /* Reserved */
put_be32(pb, 0); /* Reserved */
put_be32(pb, 0); /* Reserved */
put_be32(pb, 0); /* Reserved */
-
- put_be16(pb, 0); /* Reserved */
- put_be32(pb, 0); /* Reserved */
put_be32(pb, 0); /* Reserved */
put_be32(pb, 0); /* Reserved */
+
put_be16(pb, 0x18); /* Reserved */
put_be16(pb, 0xffff); /* Reserved */
if(track->enc->codec_id == CODEC_ID_MPEG4)
return 0x14;
}
-static int mov_write_minf_tag(ByteIOContext *pb, MOVTrack* track)
-{
- int 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);
- mov_write_dinf_tag(pb);
- mov_write_stbl_tag(pb, track);
- return updateSize(pb, pos);
-}
-
static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track)
{
- char *str;
+ char *descr, *hdlr, *hdlr_type;
int 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_be32(pb, 0); /* reserved */
- if(track->enc->codec_type == CODEC_TYPE_VIDEO)
- put_tag(pb, "vide"); /* handler type */
- else
- put_tag(pb, "soun"); /* handler type */
+ 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)
+{
+ int pos = url_ftell(pb);
+ put_be32(pb, 0); /* size */
+ put_tag(pb, "minf");
if(track->enc->codec_type == CODEC_TYPE_VIDEO)
- str = "VideoHandler";
+ mov_write_vmhd_tag(pb);
else
- str = "SoundHandler";
- put_byte(pb, strlen(str)); /* string counter */
- put_buffer(pb, str, strlen(str));
+ 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);
}
}
/* Encoder */
+ if(!(mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT))
{
int pos = url_ftell(pb);
put_be32(pb, 0); /* size */
return 0;
}
-static int Timestamp(void) {
- return 1067949799U+(24107*86400); //its the modification time of this line :)
-}
-
-static int mov_write_packet(AVFormatContext *s, int stream_index,
- const uint8_t *buf, int size, int64_t pts)
+static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
{
MOVContext *mov = s->priv_data;
ByteIOContext *pb = &s->pb;
- AVCodecContext *enc = &s->streams[stream_index]->codec;
- MOVTrack* trk = &mov->tracks[stream_index];
+ AVCodecContext *enc = &s->streams[pkt->stream_index]->codec;
+ MOVTrack* trk = &mov->tracks[pkt->stream_index];
int cl, id;
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 */
int len = 0;
while (len < size && samplesInChunk < 100) {
- len += packed_size[(buf[len] >> 3) & 0x0F];
+ len += packed_size[(pkt->data[len] >> 3) & 0x0F];
samplesInChunk++;
}
}
else if(enc->codec_id == CODEC_ID_PCM_ALAW) {
samplesInChunk = size/enc->channels;
}
+ else if(enc->codec_id == CODEC_ID_PCM_S16BE || enc->codec_id == CODEC_ID_PCM_S16LE) {
+ samplesInChunk = size/(2*enc->channels);
+ }
else {
samplesInChunk = 1;
}
if ((enc->codec_id == CODEC_ID_MPEG4 || enc->codec_id == CODEC_ID_AAC)
&& trk->vosLen == 0) {
- assert(enc->extradata_size);
+// assert(enc->extradata_size);
trk->vosLen = enc->extradata_size;
trk->vosData = av_malloc(trk->vosLen);
if (mov->mdat_written == 0) {
mov_write_mdat_tag(pb, mov);
mov->mdat_written = 1;
- mov->time = Timestamp();
+ mov->time = s->timestamp;
}
trk->cluster[cl][id].pos = url_ftell(pb);
trk->cluster[cl][id].size = size;
trk->cluster[cl][id].entries = samplesInChunk;
if(enc->codec_type == CODEC_TYPE_VIDEO) {
- trk->cluster[cl][id].key_frame = enc->coded_frame->key_frame;
- if(enc->coded_frame->pict_type == FF_I_TYPE)
+ trk->cluster[cl][id].key_frame = !!(pkt->flags & PKT_FLAG_KEY);
+ if(trk->cluster[cl][id].key_frame)
trk->hasKeyframes = 1;
}
trk->enc = enc;
trk->sampleCount += samplesInChunk;
trk->mdat_size += size;
- put_buffer(pb, buf, size);
+ put_buffer(pb, pkt->data, size);
put_flush_packet(pb);
return 0;
projects / ffmpeg / blobdiff