/*
* AVI demuxer
- * Copyright (c) 2001 Fabrice Bellard.
+ * Copyright (c) 2001 Fabrice Bellard
*
* This file is part of FFmpeg.
*
return -1;
if(header[7] == 0x19)
- av_log(NULL, AV_LOG_INFO, "file has been generated with a totally broken muxer\n");
+ av_log(NULL, AV_LOG_INFO, "This file has been generated by a totally broken muxer.\n");
return 0;
}
switch(tag) {
case MKTAG('L', 'I', 'S', 'T'):
- /* ignored, except when start of video packets */
+ /* Ignored, except at start of video packets. */
tag1 = get_le32(pb);
#ifdef DEBUG
print_tag("list", tag1, 0);
case MKTAG('a', 'm', 'v', 'h'):
amv_file_format=1;
case MKTAG('a', 'v', 'i', 'h'):
- /* avi header */
+ /* AVI header */
/* using frame_period is bad idea */
frame_period = get_le32(pb);
bit_rate = get_le32(pb) * 8;
/*
* After some consideration -- I don't think we
- * have to support anything but DV in a type1 AVIs.
+ * have to support anything but DV in type1 AVIs.
*/
if (s->nb_streams != 1)
goto fail;
}
/*
* else, leave duration alone; timing estimation in utils.c
- * will make a guess based on bit rate.
+ * will make a guess based on bitrate.
*/
stream_index = s->nb_streams - 1;
ast->scale = get_le32(pb);
ast->rate = get_le32(pb);
if(!(ast->scale && ast->rate)){
+ av_log(s, AV_LOG_WARNING, "scale/rate is %u/%u which is invalid. (This file has been generated by broken software.)\n", ast->scale, ast->rate);
if(frame_period){
ast->rate = 1000000;
ast->scale = frame_period;
//FIXME
codec_type = CODEC_TYPE_DATA; //CODEC_TYPE_SUB ? FIXME
break;
+ case MKTAG('d', 'a', 't', 's'):
+ codec_type = CODEC_TYPE_DATA;
+ break;
default:
av_log(s, AV_LOG_ERROR, "unknown stream type %X\n", tag1);
goto fail;
if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly
get_byte(pb);
- /* Extract palette from extradata if bpp <= 8 */
- /* This code assumes that extradata contains only palette */
- /* This is true for all paletted codecs implemented in ffmpeg */
+ /* Extract palette from extradata if bpp <= 8. */
+ /* This code assumes that extradata contains only palette. */
+ /* This is true for all paletted codecs implemented in FFmpeg. */
if (st->codec->extradata_size && (st->codec->bits_per_sample <= 8)) {
st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
#ifdef WORDS_BIGENDIAN
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_tag = tag1;
st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1);
- st->need_parsing = AVSTREAM_PARSE_HEADERS; // this is needed to get the pict type which is needed for generating correct pts
+ st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts.
// url_fskip(pb, size - 5 * 4);
break;
case CODEC_TYPE_AUDIO:
if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */
url_fskip(pb, 1);
/* Force parsing as several audio frames can be in
- * one packet and timestamps refer to packet start*/
+ * one packet and timestamps refer to packet start. */
st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS;
- /* ADTS header is in extradata, AAC without header must be stored as exact frames, parser not needed and it will fail */
+ /* ADTS header is in extradata, AAC without header must be
+ * stored as exact frames. Parser not needed and it will
+ * fail. */
if (st->codec->codec_id == CODEC_ID_AAC && st->codec->extradata_size)
st->need_parsing = AVSTREAM_PARSE_NONE;
/* AVI files with Xan DPCM audio (wrongly) declare PCM
get_le32(pb); //nbFieldsPerFrame
if(active_aspect.num && active_aspect.den && active.num && active.den){
- st->codec->sample_aspect_ratio= av_div_q(active_aspect, active);
+ st->sample_aspect_ratio= av_div_q(active_aspect, active);
//av_log(s, AV_LOG_ERROR, "vprp %d/%d %d/%d\n", active_aspect.num, active_aspect.den, active.num, active.den);
}
size -= 9*4;
break;
default:
if(size > 1000000){
- av_log(s, AV_LOG_ERROR, "well something went wrong during header parsing, "
- "ill ignore it and try to continue anyway\n");
+ av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, "
+ "I will ignore it and try to continue anyway.\n");
avi->movi_list = url_ftell(pb) - 4;
avi->movi_end = url_fsize(pb);
goto end_of_header;
/* check stream number */
if (stream_index != s->nb_streams - 1) {
fail:
- for(i=0;i<s->nb_streams;i++) {
- av_freep(&s->streams[i]->codec->extradata);
- av_freep(&s->streams[i]);
- }
return -1;
}
avi_load_index(s);
avi->index_loaded = 1;
avi->non_interleaved |= guess_ni_flag(s);
- if(avi->non_interleaved)
+ if(avi->non_interleaved) {
+ av_log(s, AV_LOG_INFO, "non-interleaved AVI\n");
clean_index(s);
+ }
return 0;
}
ts= av_rescale(ts, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den);
// av_log(NULL, AV_LOG_DEBUG, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset);
- if(ts < best_ts){
+ if(ts < best_ts && st->nb_index_entries){
best_ts= ts;
best_st= st;
best_stream_index= i;
}
}
+ if(!best_st)
+ return -1;
+
best_ast = best_st->priv_data;
best_ts= av_rescale(best_ts, best_st->time_base.den, AV_TIME_BASE * (int64_t)best_st->time_base.num); //FIXME a little ugly
if(best_ast->remaining)
pkt->destruct = dstr;
pkt->flags |= PKT_FLAG_KEY;
} else {
- /* XXX: how to handle B frames in avi ? */
+ /* XXX: How to handle B-frames in AVI? */
pkt->dts = ast->frame_offset;
// pkt->dts += ast->start;
if(ast->sample_size)
&& d[1] >= '0' && d[1] <= '9'){
n= (d[0] - '0') * 10 + (d[1] - '0');
}else{
- n= 100; //invalid stream id
+ n= 100; //invalid stream ID
}
//parse ##dc/##wb
n=1;
st = st1;
ast = ast1;
- av_log(s, AV_LOG_WARNING, "Invalid stream+prefix combination, assuming audio\n");
+ av_log(s, AV_LOG_WARNING, "Invalid stream + prefix combination, assuming audio.\n");
}
}
return -1;
}
-/* XXX: we make the implicit supposition that the position are sorted
- for each stream */
+/* XXX: We make the implicit supposition that the positions are sorted
+ for each stream. */
static int avi_read_idx1(AVFormatContext *s, int size)
{
AVIContext *avi = s->priv_data;
if (nb_index_entries <= 0)
return -1;
- /* read the entries and sort them in each stream component */
+ /* Read the entries and sort them in each stream component. */
for(i = 0; i < nb_index_entries; i++) {
tag = get_le32(pb);
flags = get_le32(pb);
if (ENABLE_DV_DEMUXER && avi->dv_demux) {
/* One and only one real stream for DV in AVI, and it has video */
- /* offsets. Calling with other stream indices should have failed */
+ /* offsets. Calling with other stream indexes should have failed */
/* the av_index_search_timestamp call above. */
assert(stream_index == 0);
/* Feed the DV video stream version of the timestamp to the */
- /* DV demux so it can synth correct timestamps */
+ /* DV demux so it can synthesize correct timestamps. */
dv_offset_reset(avi->dv_demux, timestamp);
url_fseek(s->pb, pos, SEEK_SET);
continue;
// assert(st2->codec->block_align);
- assert(st2->time_base.den == ast2->rate);
- assert(st2->time_base.num == ast2->scale);
+ assert((int64_t)st2->time_base.num*ast2->rate == (int64_t)st2->time_base.den*ast2->scale);
index = av_index_search_timestamp(
st2,
av_rescale(timestamp, st2->time_base.den*(int64_t)st->time_base.num, st->time_base.den * (int64_t)st2->time_base.num),
for(i=0;i<s->nb_streams;i++) {
AVStream *st = s->streams[i];
- AVIStream *ast = st->priv_data;
- av_free(ast);
av_free(st->codec->palctrl);
}
AVInputFormat avi_demuxer = {
"avi",
- "avi format",
+ NULL_IF_CONFIG_SMALL("AVI format"),
sizeof(AVIContext),
avi_probe,
avi_read_header,