DVDemuxContext* dv_demux;
} AVIContext;
+static const char avi_headers[][8] = {
+ { 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' },
+ { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' },
+ { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19},
+ { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' },
+ { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' },
+ { 0 }
+};
+
static int avi_load_index(AVFormatContext *s);
static int guess_ni_flag(AVFormatContext *s);
static int get_riff(AVIContext *avi, ByteIOContext *pb)
{
- uint32_t tag;
- /* check RIFF header */
- tag = get_le32(pb);
+ char header[8];
+ int i;
- if (tag != MKTAG('R', 'I', 'F', 'F'))
- return -1;
+ /* check RIFF header */
+ get_buffer(pb, header, 4);
avi->riff_end = get_le32(pb); /* RIFF chunk size */
avi->riff_end += url_ftell(pb); /* RIFF chunk end */
- tag = get_le32(pb);
- if(tag == MKTAG('A', 'V', 'I', 0x19))
- av_log(NULL, AV_LOG_INFO, "file has been generated with a totally broken muxer\n");
- else
- if (tag != MKTAG('A', 'V', 'I', ' ') && tag != MKTAG('A', 'V', 'I', 'X'))
+ get_buffer(pb, header+4, 4);
+
+ for(i=0; avi_headers[i][0]; i++)
+ if(!memcmp(header, avi_headers[i], 8))
+ break;
+ if(!avi_headers[i][0])
return -1;
+ if(header[7] == 0x19)
+ av_log(NULL, AV_LOG_INFO, "file has been generated with a totally broken muxer\n");
+
return 0;
}
static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
AVIContext *avi = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int longs_pre_entry= get_le16(pb);
int index_sub_type = get_byte(pb);
int index_type = get_byte(pb);
AVIStream *ast;
int i;
int64_t last_pos= -1;
- int64_t filesize= url_fsize(&s->pb);
+ int64_t filesize= url_fsize(s->pb);
#ifdef DEBUG_SEEK
av_log(s, AV_LOG_ERROR, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%16"PRIX64"\n",
static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
AVIContext *avi = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
uint32_t tag, tag1, handler;
int codec_type, stream_index, frame_period, bit_rate;
unsigned int size, nb_frames;
AVStream *st;
AVIStream *ast = NULL;
char str_track[4];
+ int avih_width=0, avih_height=0;
+ int amv_file_format=0;
avi->stream_index= -1;
avi->is_odml = 1;
url_fskip(pb, size + (size & 1));
break;
+ case MKTAG('a', 'm', 'v', 'h'):
+ amv_file_format=1;
case MKTAG('a', 'v', 'i', 'h'):
/* avi header */
/* using frame_period is bad idea */
url_fskip(pb, 2 * 4);
get_le32(pb);
+ get_le32(pb);
+ avih_width=get_le32(pb);
+ avih_height=get_le32(pb);
- url_fskip(pb, size - 7 * 4);
+ url_fskip(pb, size - 10 * 4);
break;
case MKTAG('s', 't', 'r', 'h'):
/* stream header */
goto fail;
st->priv_data = ast;
}
+ if(amv_file_format)
+ tag1 = stream_index ? MKTAG('a','u','d','s') : MKTAG('v','i','d','s');
#ifdef DEBUG
print_tag("strh", tag1, -1);
st = s->streams[stream_index];
switch(codec_type) {
case CODEC_TYPE_VIDEO:
+ if(amv_file_format){
+ st->codec->width=avih_width;
+ st->codec->height=avih_height;
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_id = CODEC_ID_AMV;
+ url_fskip(pb, size);
+ break;
+ }
get_le32(pb); /* size */
st->codec->width = get_le32(pb);
st->codec->height = get_le32(pb);
st->codec->codec_id = CODEC_ID_XAN_DPCM;
st->codec->codec_tag = 0;
}
+ if (amv_file_format)
+ st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV;
break;
default:
st->codec->codec_type = CODEC_TYPE_DATA;
static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIContext *avi = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int n, d[8], size;
offset_t i, sync;
void* dstr;
if(i>=0){
int64_t pos= best_st->index_entries[i].pos;
pos += best_ast->packet_size - best_ast->remaining;
- url_fseek(&s->pb, pos + 8, SEEK_SET);
+ url_fseek(s->pb, pos + 8, SEEK_SET);
// av_log(NULL, AV_LOG_DEBUG, "pos=%"PRId64"\n", pos);
assert(best_ast->remaining <= best_ast->packet_size);
static int avi_read_idx1(AVFormatContext *s, int size)
{
AVIContext *avi = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int nb_index_entries, i;
AVStream *st;
AVIStream *ast;
static int avi_load_index(AVFormatContext *s)
{
AVIContext *avi = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
uint32_t tag, size;
offset_t pos= url_ftell(pb);
/* DV demux so it can synth correct timestamps */
dv_offset_reset(avi->dv_demux, timestamp);
- url_fseek(&s->pb, pos, SEEK_SET);
+ url_fseek(s->pb, pos, SEEK_SET);
avi->stream_index= -1;
return 0;
}
}
/* do the seek */
- url_fseek(&s->pb, pos, SEEK_SET);
+ url_fseek(s->pb, pos, SEEK_SET);
avi->stream_index= -1;
return 0;
}
static int avi_probe(AVProbeData *p)
{
+ int i;
+
/* check file header */
- if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
- p->buf[2] == 'F' && p->buf[3] == 'F' &&
- p->buf[8] == 'A' && p->buf[9] == 'V' &&
- p->buf[10] == 'I' && (p->buf[11] == ' ' || p->buf[11] == 0x19))
- return AVPROBE_SCORE_MAX;
- else
- return 0;
+ for(i=0; avi_headers[i][0]; i++)
+ if(!memcmp(p->buf , avi_headers[i] , 4) &&
+ !memcmp(p->buf+8, avi_headers[i]+4, 4))
+ return AVPROBE_SCORE_MAX;
+
+ return 0;
}
AVInputFormat avi_demuxer = {