/*
* 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++;
for (i=0; i<MAX_STREAMS; i++)
avi->indexes[i].entry = 0;
- avi->riff_start = start_tag(pb, "RIFF");
+ avi->riff_start = ff_start_tag(pb, "RIFF");
put_tag(pb, riff_tag);
- loff = start_tag(pb, "LIST");
+ loff = ff_start_tag(pb, "LIST");
put_tag(pb, list_tag);
return loff;
}
if (type == CODEC_TYPE_VIDEO) {
tag[2] = 'd';
tag[3] = 'c';
+ } else if (type == CODEC_TYPE_SUBTITLE) {
+ // note: this is not an official code
+ tag[2] = 's';
+ tag[3] = 'b';
} else {
tag[2] = 'w';
tag[3] = 'b';
}
}
+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;
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);
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;
/* stream list */
for(i=0;i<n;i++) {
- list2 = start_tag(pb, "LIST");
+ list2 = ff_start_tag(pb, "LIST");
put_tag(pb, "strl");
stream = s->streams[i]->codec;
/* stream generic header */
- strh = start_tag(pb, "strh");
+ strh = ff_start_tag(pb, "strh");
switch(stream->codec_type) {
+ case CODEC_TYPE_SUBTITLE:
+ // XSUB subtitles behave like video tracks, other subtitles
+ // are not (yet) supported.
+ if (stream->codec_id != CODEC_ID_XSUB) break;
case CODEC_TYPE_VIDEO: put_tag(pb, "vids"); break;
case CODEC_TYPE_AUDIO: put_tag(pb, "auds"); break;
// case CODEC_TYPE_TEXT : put_tag(pb, "txts"); break;
case CODEC_TYPE_DATA : put_tag(pb, "dats"); break;
}
- if(stream->codec_type == CODEC_TYPE_VIDEO)
+ if(stream->codec_type == CODEC_TYPE_VIDEO ||
+ stream->codec_id == CODEC_ID_XSUB)
put_le32(pb, stream->codec_tag);
else
put_le32(pb, 1);
put_le32(pb, 0);
put_le16(pb, stream->width);
put_le16(pb, stream->height);
- end_tag(pb, strh);
+ ff_end_tag(pb, strh);
if(stream->codec_type != CODEC_TYPE_DATA){
- strf = start_tag(pb, "strf");
+ strf = ff_start_tag(pb, "strf");
switch(stream->codec_type) {
+ case CODEC_TYPE_SUBTITLE:
+ // XSUB subtitles behave like video tracks, other subtitles
+ // are not (yet) supported.
+ if (stream->codec_id != CODEC_ID_XSUB) break;
case CODEC_TYPE_VIDEO:
- put_bmp_header(pb, stream, codec_bmp_tags, 0);
+ ff_put_bmp_header(pb, stream, ff_codec_bmp_tags, 0);
break;
case CODEC_TYPE_AUDIO:
- if (put_wav_header(pb, stream) < 0) {
- av_free(avi);
+ if (ff_put_wav_header(pb, stream) < 0) {
return -1;
}
break;
default:
return -1;
}
- end_tag(pb, strf);
+ ff_end_tag(pb, strf);
}
if (!url_is_streamed(pb)) {
* for compatibility reasons.
*/
avi->indexes[i].entry = avi->indexes[i].ents_allocated = 0;
- avi->indexes[i].indx_start = start_tag(pb, "JUNK");
+ avi->indexes[i].indx_start = ff_start_tag(pb, "JUNK");
put_le16(pb, 4); /* wLongsPerEntry */
put_byte(pb, 0); /* bIndexSubType (0 == frame index) */
put_byte(pb, 0); /* bIndexType (0 == AVI_INDEX_OF_INDEXES) */
put_le32(pb, 0); Must be 0. */
for (j=0; j < AVI_MASTER_INDEX_SIZE * 2; j++)
put_le64(pb, 0);
- end_tag(pb, avi->indexes[i].indx_start);
+ ff_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");
+ int vprp= ff_start_tag(pb, "vprp");
AVRational dar = av_mul_q(s->streams[i]->sample_aspect_ratio,
(AVRational){stream->width, stream->height});
int num, den;
put_le32(pb, 0);
put_le32(pb, 0);
- end_tag(pb, vprp);
+ ff_end_tag(pb, vprp);
}
- end_tag(pb, list2);
+ ff_end_tag(pb, list2);
}
if (!url_is_streamed(pb)) {
/* AVI could become an OpenDML one, if it grows beyond 2Gb range */
- avi->odml_list = start_tag(pb, "JUNK");
+ avi->odml_list = ff_start_tag(pb, "JUNK");
put_tag(pb, "odml");
put_tag(pb, "dmlh");
put_le32(pb, 248);
for (i = 0; i < 248; i+= 4)
put_le32(pb, 0);
- end_tag(pb, avi->odml_list);
+ ff_end_tag(pb, avi->odml_list);
}
- end_tag(pb, list1);
+ ff_end_tag(pb, list1);
- list2 = start_tag(pb, "LIST");
+ list2 = ff_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);
+ ff_end_tag(pb, list2);
/* some padding for easier tag editing */
- list2 = start_tag(pb, "JUNK");
+ list2 = ff_start_tag(pb, "JUNK");
for (i = 0; i < 1016; i += 4)
put_le32(pb, 0);
- end_tag(pb, list2);
+ ff_end_tag(pb, list2);
- avi->movi_list = start_tag(pb, "LIST");
+ avi->movi_list = ff_start_tag(pb, "LIST");
put_tag(pb, "movi");
put_flush_packet(pb);
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;
{
ByteIOContext *pb = s->pb;
AVIContext *avi = s->priv_data;
- offset_t idx_chunk;
+ int64_t idx_chunk;
int i;
char tag[5];
int entry[MAX_STREAMS];
int empty, stream_id = -1;
- idx_chunk = start_tag(pb, "idx1");
+ idx_chunk = ff_start_tag(pb, "idx1");
memset(&entry[0], 0, sizeof(entry));
do {
empty = 1;
entry[stream_id]++;
}
} while (!empty);
- end_tag(pb, idx_chunk);
+ ff_end_tag(pb, idx_chunk);
avi_write_counters(s, avi->riff_id);
}
(url_ftell(pb) - avi->riff_start > AVI_MAX_RIFF_SIZE)) {
avi_write_ix(s);
- end_tag(pb, avi->movi_list);
+ ff_end_tag(pb, avi->movi_list);
if (avi->riff_id == 1)
avi_write_idx1(s);
- end_tag(pb, avi->riff_start);
+ ff_end_tag(pb, avi->riff_start);
avi->movi_list = avi_start_new_riff(avi, pb, "AVIX", "movi");
}
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);
+ ff_end_tag(pb, avi->movi_list);
res = avi_write_idx1(s);
- end_tag(pb, avi->riff_start);
+ ff_end_tag(pb, avi->riff_start);
} else {
avi_write_ix(s);
- end_tag(pb, avi->movi_list);
- end_tag(pb, avi->riff_start);
+ ff_end_tag(pb, avi->movi_list);
+ ff_end_tag(pb, avi->riff_start);
file_size = url_ftell(pb);
url_fseek(pb, avi->odml_list - 8, SEEK_SET);
for (i=0; i<MAX_STREAMS; i++) {
for (j=0; j<avi->indexes[i].ents_allocated/AVI_INDEX_CLUSTER_SIZE; j++)
av_free(avi->indexes[i].cluster[j]);
- av_free(avi->indexes[i].cluster);
- avi->indexes[i].cluster = NULL;
+ av_freep(&avi->indexes[i].cluster);
avi->indexes[i].ents_allocated = avi->indexes[i].entry = 0;
}
avi_write_header,
avi_write_packet,
avi_write_trailer,
- .codec_tag= (const AVCodecTag* const []){codec_bmp_tags, codec_wav_tags, 0},
+ .codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
+ .flags= AVFMT_VARIABLE_FPS,
};
-#endif //CONFIG_AVI_MUXER
projects / ffmpeg / blobdiff