/*
* AVI demuxer
- * Copyright (c) 2001 Fabrice Bellard.
+ * Copyright (c) 2001 Fabrice Bellard
*
* This file is part of FFmpeg.
*
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/intreadwrite.h"
+#include "libavutil/bswap.h"
#include "avformat.h"
#include "avi.h"
#include "dv.h"
int64_t riff_end;
int64_t movi_end;
int64_t fsize;
- offset_t movi_list;
+ int64_t movi_list;
+ int64_t last_pkt_pos;
int index_loaded;
int is_odml;
int non_interleaved;
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;
}
#endif
if(last_pos == pos || pos == base - 8)
avi->non_interleaved= 1;
- else
+ if(last_pos != pos)
av_add_index_entry(st, pos, ast->cum_len / FFMAX(1, ast->sample_size), len, 0, key ? AVINDEX_KEYFRAME : 0);
if(ast->sample_size)
}
}
-static int avi_read_tag(ByteIOContext *pb, char *buf, int maxlen, unsigned int size)
+static int avi_read_tag(AVFormatContext *s, const char *key, unsigned int size)
{
- offset_t i = url_ftell(pb);
+ ByteIOContext *pb = s->pb;
+ uint8_t value[1024];
+
+ int64_t i = url_ftell(pb);
size += (size & 1);
- get_strz(pb, buf, maxlen);
+ get_strz(pb, value, sizeof(value));
url_fseek(pb, i+size, SEEK_SET);
- return 0;
+
+ return av_metadata_set(&s->metadata, key, value);
}
static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
AVIContext *avi = s->priv_data;
ByteIOContext *pb = s->pb;
- uint32_t tag, tag1, handler;
+ unsigned int tag, tag1, handler;
int codec_type, stream_index, frame_period, bit_rate;
unsigned int size, nb_frames;
int i;
AVStream *st;
AVIStream *ast = NULL;
- char str_track[4];
int avih_width=0, avih_height=0;
int amv_file_format=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;
av_freep(&s->streams[0]->codec->extradata);
av_freep(&s->streams[0]);
s->nb_streams = 0;
- if (ENABLE_DV_DEMUXER) {
+ if (CONFIG_DV_DEMUXER) {
avi->dv_demux = dv_init_demux(s);
if (!avi->dv_demux)
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);
+ 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;
st->codec->width = get_le32(pb);
st->codec->height = get_le32(pb);
get_le16(pb); /* panes */
- st->codec->bits_per_sample= get_le16(pb); /* depth */
+ st->codec->bits_per_coded_sample= get_le16(pb); /* depth */
tag1 = get_le32(pb);
get_le32(pb); /* ImageSize */
get_le32(pb); /* XPelsPerMeter */
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 */
- if (st->codec->extradata_size && (st->codec->bits_per_sample <= 8)) {
+ /* 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_coded_sample <= 8)) {
st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
#ifdef WORDS_BIGENDIAN
for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
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
* audio in the header but have Axan as stream_code_tag. */
- if (st->codec->stream_codec_tag == ff_get_fourcc("Axan")){
+ if (st->codec->stream_codec_tag == AV_RL32("Axan")){
st->codec->codec_id = CODEC_ID_XAN_DPCM;
st->codec->codec_tag = 0;
}
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;
url_fseek(pb, size, SEEK_CUR);
break;
case MKTAG('I', 'N', 'A', 'M'):
- avi_read_tag(pb, s->title, sizeof(s->title), size);
+ avi_read_tag(s, "Title", size);
break;
case MKTAG('I', 'A', 'R', 'T'):
- avi_read_tag(pb, s->author, sizeof(s->author), size);
+ avi_read_tag(s, "Artist", size);
break;
case MKTAG('I', 'C', 'O', 'P'):
- avi_read_tag(pb, s->copyright, sizeof(s->copyright), size);
+ avi_read_tag(s, "Copyright", size);
break;
case MKTAG('I', 'C', 'M', 'T'):
- avi_read_tag(pb, s->comment, sizeof(s->comment), size);
+ avi_read_tag(s, "Comment", size);
break;
case MKTAG('I', 'G', 'N', 'R'):
- avi_read_tag(pb, s->genre, sizeof(s->genre), size);
+ avi_read_tag(s, "Genre", size);
break;
case MKTAG('I', 'P', 'R', 'D'):
- avi_read_tag(pb, s->album, sizeof(s->album), size);
+ avi_read_tag(s, "Album", size);
break;
case MKTAG('I', 'P', 'R', 'T'):
- avi_read_tag(pb, str_track, sizeof(str_track), size);
- sscanf(str_track, "%d", &s->track);
+ avi_read_tag(s, "Track", size);
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;
avi->index_loaded = 1;
avi->non_interleaved |= guess_ni_flag(s);
if(avi->non_interleaved) {
- av_log(s, AV_LOG_INFO, "Non interleaved AVI\n");
+ av_log(s, AV_LOG_INFO, "non-interleaved AVI\n");
clean_index(s);
}
return 0;
}
+static int get_stream_idx(int *d){
+ if( d[0] >= '0' && d[0] <= '9'
+ && d[1] >= '0' && d[1] <= '9'){
+ return (d[0] - '0') * 10 + (d[1] - '0');
+ }else{
+ return 100; //invalid stream ID
+ }
+}
+
static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIContext *avi = s->priv_data;
ByteIOContext *pb = s->pb;
int n, d[8], size;
- offset_t i, sync;
+ int64_t i, sync;
void* dstr;
- if (ENABLE_DV_DEMUXER && avi->dv_demux) {
+ if (CONFIG_DV_DEMUXER && avi->dv_demux) {
size = dv_get_packet(avi->dv_demux, pkt);
if (size >= 0)
return size;
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)
i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD);
- else
+ else{
i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY);
+ if(i>=0)
+ best_ast->frame_offset= best_st->index_entries[i].timestamp
+ * FFMAX(1, best_ast->sample_size);
+ }
// av_log(NULL, AV_LOG_DEBUG, "%d\n", i);
if(i>=0){
if(size > ast->remaining)
size= ast->remaining;
+ avi->last_pkt_pos= url_ftell(pb);
av_get_packet(pb, pkt, size);
if(ast->has_pal && pkt->data && pkt->size<(unsigned)INT_MAX/2){
memcpy(pkt->data + pkt->size - 4*256, ast->pal, 4*256);
}
- if (ENABLE_DV_DEMUXER && avi->dv_demux) {
+ if (CONFIG_DV_DEMUXER && avi->dv_demux) {
dstr = pkt->destruct;
size = dv_produce_packet(avi->dv_demux, pkt,
pkt->data, pkt->size);
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)
size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24);
- if( d[2] >= '0' && d[2] <= '9'
- && d[3] >= '0' && d[3] <= '9'){
- n= (d[2] - '0') * 10 + (d[3] - '0');
- }else{
- n= 100; //invalid stream id
- }
+ n= get_stream_idx(d+2);
//av_log(NULL, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %"PRId64" %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
if(i + size > avi->fsize || d[0]<0)
continue;
goto resync;
}
- if( d[0] >= '0' && d[0] <= '9'
- && d[1] >= '0' && d[1] <= '9'){
- n= (d[0] - '0') * 10 + (d[1] - '0');
- }else{
- n= 100; //invalid stream id
- }
+ n= get_stream_idx(d);
+
+ if(!((i-avi->last_pkt_pos)&1) && get_stream_idx(d+1) < s->nb_streams)
+ continue;
//parse ##dc/##wb
if(n < s->nb_streams){
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);
AVIContext *avi = s->priv_data;
ByteIOContext *pb = s->pb;
uint32_t tag, size;
- offset_t pos= url_ftell(pb);
+ int64_t pos= url_ftell(pb);
url_fseek(pb, avi->movi_end, SEEK_SET);
#ifdef DEBUG_SEEK
// av_log(NULL, AV_LOG_DEBUG, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp);
- if (ENABLE_DV_DEMUXER && avi->dv_demux) {
+ if (CONFIG_DV_DEMUXER && avi->dv_demux) {
/* One and only one real stream for DV in AVI, and it has video */
/* 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);
}
projects / ffmpeg / blobdiff