/*
* AVI muxer
- * Copyright (c) 2000 Fabrice Bellard.
+ * Copyright (c) 2000 Fabrice Bellard
*
* This file is part of FFmpeg.
*
* - fill all fields if non streamed (nb_frames for example)
*/
-#ifdef CONFIG_AVI_MUXER
typedef struct AVIIentry {
unsigned int flags, pos, len;
} AVIIentry;
#define AVI_INDEX_CLUSTER_SIZE 16384
typedef struct AVIIndex {
- offset_t indx_start;
+ int64_t indx_start;
int entry;
int ents_allocated;
AVIIentry** cluster;
} AVIIndex;
typedef struct {
- offset_t riff_start, movi_list, odml_list;
- offset_t frames_hdr_all, frames_hdr_strm[MAX_STREAMS];
+ int64_t riff_start, movi_list, odml_list;
+ int64_t frames_hdr_all, frames_hdr_strm[MAX_STREAMS];
int audio_strm_length[MAX_STREAMS];
int riff_id;
int packet_count[MAX_STREAMS];
return &idx->cluster[cl][id];
}
-static offset_t avi_start_new_riff(AVIContext *avi, ByteIOContext *pb,
- const char* riff_tag, const char* list_tag)
+static int64_t avi_start_new_riff(AVIContext *avi, ByteIOContext *pb,
+ const char* riff_tag, const char* list_tag)
{
- offset_t loff;
+ int64_t loff;
int i;
avi->riff_id++;
}
}
+static void avi_write_info_tag2(AVFormatContext *s, const char *fourcc, const char *key1, const char *key2)
+{
+ AVMetadataTag *tag= av_metadata_get(s->metadata, key1, NULL, 0);
+ if(!tag && key2)
+ tag= av_metadata_get(s->metadata, key2, NULL, 0);
+ if(tag)
+ avi_write_info_tag(s->pb, fourcc, tag->value);
+}
+
static int avi_write_counters(AVFormatContext* s, int riff_id)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVIContext *avi = s->priv_data;
int n, au_byterate, au_ssize, au_scale, nb_frames = 0;
- offset_t file_size;
+ int64_t file_size;
AVCodecContext* stream;
file_size = url_ftell(pb);
static int avi_write_header(AVFormatContext *s)
{
AVIContext *avi = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int bitrate, n, i, nb_frames, au_byterate, au_ssize, au_scale;
AVCodecContext *stream, *video_enc;
- offset_t list1, list2, strh, strf;
+ int64_t list1, list2, strh, strf;
/* header list */
avi->riff_id = 0;
nb_frames = 0;
if(video_enc){
- put_le32(pb, (uint32_t)(int64_t_C(1000000) * video_enc->time_base.num / video_enc->time_base.den));
+ put_le32(pb, (uint32_t)(INT64_C(1000000) * video_enc->time_base.num / video_enc->time_base.den));
} else {
put_le32(pb, 0);
}
stream = s->streams[i]->codec;
- /* FourCC should really be set by the codec itself */
- if (! stream->codec_tag) {
- stream->codec_tag = codec_get_bmp_tag(stream->codec_id);
- }
-
/* stream generic header */
strh = start_tag(pb, "strh");
switch(stream->codec_type) {
break;
case CODEC_TYPE_AUDIO:
if (put_wav_header(pb, stream) < 0) {
- av_free(avi);
return -1;
}
break;
end_tag(pb, avi->indexes[i].indx_start);
}
+ if( stream->codec_type == CODEC_TYPE_VIDEO
+ && s->streams[i]->sample_aspect_ratio.num>0
+ && s->streams[i]->sample_aspect_ratio.den>0){
+ int vprp= start_tag(pb, "vprp");
+ AVRational dar = av_mul_q(s->streams[i]->sample_aspect_ratio,
+ (AVRational){stream->width, stream->height});
+ int num, den;
+ av_reduce(&num, &den, dar.num, dar.den, 0xFFFF);
+
+ put_le32(pb, 0); //video format = unknown
+ put_le32(pb, 0); //video standard= unknown
+ put_le32(pb, lrintf(1.0/av_q2d(stream->time_base)));
+ put_le32(pb, stream->width );
+ put_le32(pb, stream->height);
+ put_le16(pb, den);
+ put_le16(pb, num);
+ put_le32(pb, stream->width );
+ put_le32(pb, stream->height);
+ put_le32(pb, 1); //progressive FIXME
+
+ put_le32(pb, stream->height);
+ put_le32(pb, stream->width );
+ put_le32(pb, stream->height);
+ put_le32(pb, stream->width );
+ put_le32(pb, 0);
+ put_le32(pb, 0);
+
+ put_le32(pb, 0);
+ put_le32(pb, 0);
+ end_tag(pb, vprp);
+ }
+
end_tag(pb, list2);
}
list2 = start_tag(pb, "LIST");
put_tag(pb, "INFO");
- avi_write_info_tag(pb, "INAM", s->title);
- avi_write_info_tag(pb, "IART", s->author);
- avi_write_info_tag(pb, "ICOP", s->copyright);
- avi_write_info_tag(pb, "ICMT", s->comment);
- avi_write_info_tag(pb, "IPRD", s->album);
- avi_write_info_tag(pb, "IGNR", s->genre);
- if (s->track) {
- char str_track[4];
- snprintf(str_track, 4, "%d", s->track);
- avi_write_info_tag(pb, "IPRT", str_track);
- }
+ avi_write_info_tag2(s, "INAM", "Title", NULL);
+ avi_write_info_tag2(s, "IART", "Artist", "Author");
+ avi_write_info_tag2(s, "ICOP", "Copyright", NULL);
+ avi_write_info_tag2(s, "ICMT", "Comment", NULL);
+ avi_write_info_tag2(s, "IPRD", "Album", NULL);
+ avi_write_info_tag2(s, "IGNR", "Genre", NULL);
+ avi_write_info_tag2(s, "IPRT", "Track", NULL);
if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
avi_write_info_tag(pb, "ISFT", LIBAVFORMAT_IDENT);
end_tag(pb, list2);
static int avi_write_ix(AVFormatContext *s)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVIContext *avi = s->priv_data;
char tag[5];
char ix_tag[] = "ix00";
return -1;
for (i=0;i<s->nb_streams;i++) {
- offset_t ix, pos;
+ int64_t ix, pos;
avi_stream2fourcc(&tag[0], i, s->streams[i]->codec->codec_type);
ix_tag[3] = '0' + i;
static int avi_write_idx1(AVFormatContext *s)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVIContext *avi = s->priv_data;
- offset_t idx_chunk;
+ int64_t idx_chunk;
int i;
char tag[5];
static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIContext *avi = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
unsigned char tag[5];
unsigned int flags=0;
const int stream_index= pkt->stream_index;
avi->audio_strm_length[stream_index] += size;
}
- if (!url_is_streamed(&s->pb)) {
+ if (!url_is_streamed(s->pb)) {
AVIIndex* idx = &avi->indexes[stream_index];
int cl = idx->entry / AVI_INDEX_CLUSTER_SIZE;
int id = idx->entry % AVI_INDEX_CLUSTER_SIZE;
static int avi_write_trailer(AVFormatContext *s)
{
AVIContext *avi = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int res = 0;
int i, j, n, nb_frames;
- offset_t file_size;
+ int64_t file_size;
- if (!url_is_streamed(pb))
- {
- if (avi->riff_id == 1) {
- end_tag(pb, avi->movi_list);
- res = avi_write_idx1(s);
- end_tag(pb, avi->riff_start);
- } else {
- avi_write_ix(s);
- end_tag(pb, avi->movi_list);
- end_tag(pb, avi->riff_start);
-
- file_size = url_ftell(pb);
- url_fseek(pb, avi->odml_list - 8, SEEK_SET);
- put_tag(pb, "LIST"); /* Making this AVI OpenDML one */
- url_fskip(pb, 16);
-
- for (n=nb_frames=0;n<s->nb_streams;n++) {
- AVCodecContext *stream = s->streams[n]->codec;
- if (stream->codec_type == CODEC_TYPE_VIDEO) {
- if (nb_frames < avi->packet_count[n])
- nb_frames = avi->packet_count[n];
- } else {
- if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) {
- nb_frames += avi->packet_count[n];
+ if (!url_is_streamed(pb)){
+ if (avi->riff_id == 1) {
+ end_tag(pb, avi->movi_list);
+ res = avi_write_idx1(s);
+ end_tag(pb, avi->riff_start);
+ } else {
+ avi_write_ix(s);
+ end_tag(pb, avi->movi_list);
+ end_tag(pb, avi->riff_start);
+
+ file_size = url_ftell(pb);
+ url_fseek(pb, avi->odml_list - 8, SEEK_SET);
+ put_tag(pb, "LIST"); /* Making this AVI OpenDML one */
+ url_fskip(pb, 16);
+
+ for (n=nb_frames=0;n<s->nb_streams;n++) {
+ AVCodecContext *stream = s->streams[n]->codec;
+ if (stream->codec_type == CODEC_TYPE_VIDEO) {
+ if (nb_frames < avi->packet_count[n])
+ nb_frames = avi->packet_count[n];
+ } else {
+ if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) {
+ nb_frames += avi->packet_count[n];
+ }
}
}
- }
- put_le32(pb, nb_frames);
- url_fseek(pb, file_size, SEEK_SET);
+ put_le32(pb, nb_frames);
+ url_fseek(pb, file_size, SEEK_SET);
- avi_write_counters(s, avi->riff_id);
- }
+ avi_write_counters(s, avi->riff_id);
+ }
}
put_flush_packet(pb);
AVOutputFormat avi_muxer = {
"avi",
- "avi format",
+ NULL_IF_CONFIG_SMALL("AVI format"),
"video/x-msvideo",
"avi",
sizeof(AVIContext),
avi_write_header,
avi_write_packet,
avi_write_trailer,
+ .codec_tag= (const AVCodecTag* const []){codec_bmp_tags, codec_wav_tags, 0},
};
-#endif //CONFIG_AVI_MUXER
projects / ffmpeg / blobdiff