Skip to content

F
ffmpeg.wasm-core
Commit d7812209 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '10aa44aa' 

* commit '10aa44aa':
  avidec: K&R formatting cosmetics

Conflicts:
	libavformat/avidec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1ecf3802 10aa44aa
Hide whitespace changes
Inline Side-by-side
Showing with 564 additions and 466 deletions
libavformat/avidec.c
View file @ d7812209
...@@ -19,36 +19,37 @@ ...@@ -19,36 +19,37 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h" #include "libavutil/avassert.h"
#include "libavutil/mathematics.h" #include "libavutil/avstring.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/avstring.h" #include "libavutil/intreadwrite.h"
#include "libavutil/avassert.h" #include "libavutil/mathematics.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#include "avi.h" #include "avi.h"
#include "dv.h" #include "dv.h"
#include "internal.h"
#include "riff.h" #include "riff.h"
typedef struct AVIStream { typedef struct AVIStream {
int64_t frame_offset; /* current frame (video) or byte (audio) counter int64_t frame_offset; /* current frame (video) or byte (audio) counter
(used to compute the pts) */ * (used to compute the pts) */
int remaining; int remaining;
int packet_size; int packet_size;
uint32_t scale; uint32_t scale;
uint32_t rate; uint32_t rate;
int sample_size; /* size of one sample (or packet) (in the rate/scale sense) in bytes */ int sample_size; /* size of one sample (or packet)
* (in the rate/scale sense) in bytes */
int64_t cum_len; /* temporary storage (used during seek) */ int64_t cum_len; /* temporary storage (used during seek) */
int prefix; /* normally 'd'<<8 + 'c' or 'w'<<8 + 'b' */
int prefix; ///< normally 'd'<<8 + 'c' or 'w'<<8 + 'b'
int prefix_count; int prefix_count;
uint32_t pal[256]; uint32_t pal[256];
int has_pal; int has_pal;
int dshow_block_align; ///< block align variable used to emulate bugs in the MS dshow demuxer int dshow_block_align; /* block align variable used to emulate bugs in
* the MS dshow demuxer */
AVFormatContext *sub_ctx; AVFormatContext *sub_ctx;
AVPacket sub_pkt; AVPacket sub_pkt;
...@@ -59,9 +60,9 @@ typedef struct AVIStream { ...@@ -59,9 +60,9 @@ typedef struct AVIStream {
typedef struct { typedef struct {
const AVClass *class; const AVClass *class;
int64_t riff_end; int64_t riff_end;
int64_t movi_end; int64_t movi_end;
int64_t fsize; int64_t fsize;
int64_t io_fsize; int64_t io_fsize;
int64_t movi_list; int64_t movi_list;
int64_t last_pkt_pos; int64_t last_pkt_pos;
...@@ -69,7 +70,7 @@ typedef struct { ...@@ -69,7 +70,7 @@ typedef struct {
int is_odml; int is_odml;
int non_interleaved; int non_interleaved;
int stream_index; int stream_index;
DVDemuxContext* dv_demux; DVDemuxContext *dv_demux;
int odml_depth; int odml_depth;
int use_odml; int use_odml;
#define MAX_ODML_DEPTH 1000 #define MAX_ODML_DEPTH 1000
...@@ -92,11 +93,11 @@ static const AVClass demuxer_class = { ...@@ -92,11 +93,11 @@ static const AVClass demuxer_class = {
static const char avi_headers[][8] = { static const char avi_headers[][8] = {
{ 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' }, { 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' },
{ 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' }, { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' },
{ 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19}, { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19 },
{ 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' }, { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' },
{ 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' }, { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' },
{ 0 } { 0 }
}; };
...@@ -108,20 +109,21 @@ static const AVMetadataConv avi_metadata_conv[] = { ...@@ -108,20 +109,21 @@ static const AVMetadataConv avi_metadata_conv[] = {
static int avi_load_index(AVFormatContext *s); static int avi_load_index(AVFormatContext *s);
static int guess_ni_flag(AVFormatContext *s); static int guess_ni_flag(AVFormatContext *s);
#define print_tag(str, tag, size) \ #define print_tag(str, tag, size) \
av_dlog(NULL, "%s: tag=%c%c%c%c size=0x%x\n", \ av_dlog(NULL, "%s: tag=%c%c%c%c size=0x%x\n", \
str, tag & 0xff, \ str, tag & 0xff, \
(tag >> 8) & 0xff, \ (tag >> 8) & 0xff, \
(tag >> 16) & 0xff, \ (tag >> 16) & 0xff, \
(tag >> 24) & 0xff, \ (tag >> 24) & 0xff, \
size) size)
static inline int get_duration(AVIStream *ast, int len){ static inline int get_duration(AVIStream *ast, int len)
if(ast->sample_size){ {
if (ast->sample_size)
return len; return len;
}else if (ast->dshow_block_align){ else if (ast->dshow_block_align)
return (len + ast->dshow_block_align - 1)/ast->dshow_block_align; return (len + ast->dshow_block_align - 1) / ast->dshow_block_align;
}else else
return 1; return 1;
} }
...@@ -133,164 +135,180 @@ static int get_riff(AVFormatContext *s, AVIOContext *pb) ...@@ -133,164 +135,180 @@ static int get_riff(AVFormatContext *s, AVIOContext *pb)
/* check RIFF header */ /* check RIFF header */
avio_read(pb, header, 4); avio_read(pb, header, 4);
avi->riff_end = avio_rl32(pb); /* RIFF chunk size */ avi->riff_end = avio_rl32(pb); /* RIFF chunk size */
avi->riff_end += avio_tell(pb); /* RIFF chunk end */ avi->riff_end += avio_tell(pb); /* RIFF chunk end */
avio_read(pb, header+4, 4); avio_read(pb, header + 4, 4);
for(i=0; avi_headers[i][0]; i++) for (i = 0; avi_headers[i][0]; i++)
if(!memcmp(header, avi_headers[i], 8)) if (!memcmp(header, avi_headers[i], 8))
break; break;
if(!avi_headers[i][0]) if (!avi_headers[i][0])
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if(header[7] == 0x19) if (header[7] == 0x19)
av_log(s, AV_LOG_INFO, "This file has been generated by a totally broken muxer.\n"); av_log(s, AV_LOG_INFO,
"This file has been generated by a totally broken muxer.\n");
return 0; return 0;
} }
static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num)
AVIContext *avi = s->priv_data; {
AVIOContext *pb = s->pb; AVIContext *avi = s->priv_data;
int longs_pre_entry= avio_rl16(pb); AVIOContext *pb = s->pb;
int index_sub_type = avio_r8(pb); int longs_pre_entry = avio_rl16(pb);
int index_type = avio_r8(pb); int index_sub_type = avio_r8(pb);
int entries_in_use = avio_rl32(pb); int index_type = avio_r8(pb);
int chunk_id = avio_rl32(pb); int entries_in_use = avio_rl32(pb);
int64_t base = avio_rl64(pb); int chunk_id = avio_rl32(pb);
int stream_id= 10*((chunk_id&0xFF) - '0') + (((chunk_id>>8)&0xFF) - '0'); int64_t base = avio_rl64(pb);
int stream_id = ((chunk_id & 0xFF) - '0') * 10 +
((chunk_id >> 8 & 0xFF) - '0');
AVStream *st; AVStream *st;
AVIStream *ast; AVIStream *ast;
int i; int i;
int64_t last_pos= -1; int64_t last_pos = -1;
int64_t filesize= avi->fsize; int64_t filesize = avi->fsize;
av_dlog(s, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%16"PRIX64"\n", av_dlog(s,
longs_pre_entry,index_type, entries_in_use, chunk_id, base); "longs_pre_entry:%d index_type:%d entries_in_use:%d "
"chunk_id:%X base:%16"PRIX64"\n",
if(stream_id >= s->nb_streams || stream_id < 0) longs_pre_entry,
index_type,
entries_in_use,
chunk_id,
base);
if (stream_id >= s->nb_streams || stream_id < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
st= s->streams[stream_id]; st = s->streams[stream_id];
ast = st->priv_data; ast = st->priv_data;
if(index_sub_type) if (index_sub_type)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
avio_rl32(pb); avio_rl32(pb);
if(index_type && longs_pre_entry != 2) if (index_type && longs_pre_entry != 2)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if(index_type>1) if (index_type > 1)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if(filesize > 0 && base >= filesize){ if (filesize > 0 && base >= filesize) {
av_log(s, AV_LOG_ERROR, "ODML index invalid\n"); av_log(s, AV_LOG_ERROR, "ODML index invalid\n");
if(base>>32 == (base & 0xFFFFFFFF) && (base & 0xFFFFFFFF) < filesize && filesize <= 0xFFFFFFFF) if (base >> 32 == (base & 0xFFFFFFFF) &&
(base & 0xFFFFFFFF) < filesize &&
filesize <= 0xFFFFFFFF)
base &= 0xFFFFFFFF; base &= 0xFFFFFFFF;
else else
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
for(i=0; i<entries_in_use; i++){ for (i = 0; i < entries_in_use; i++) {
if(index_type){ if (index_type) {
int64_t pos= avio_rl32(pb) + base - 8; int64_t pos = avio_rl32(pb) + base - 8;
int len = avio_rl32(pb); int len = avio_rl32(pb);
int key= len >= 0; int key = len >= 0;
len &= 0x7FFFFFFF; len &= 0x7FFFFFFF;
#ifdef DEBUG_SEEK #ifdef DEBUG_SEEK
av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len); av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len);
#endif #endif
if(url_feof(pb)) if (url_feof(pb))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if(last_pos == pos || pos == base - 8) if (last_pos == pos || pos == base - 8)
avi->non_interleaved= 1; avi->non_interleaved = 1;
if(last_pos != pos && (len || !ast->sample_size)) if (last_pos != pos && (len || !ast->sample_size))
av_add_index_entry(st, pos, ast->cum_len, len, 0, key ? AVINDEX_KEYFRAME : 0); av_add_index_entry(st, pos, ast->cum_len, len, 0,
key ? AVINDEX_KEYFRAME : 0);
ast->cum_len += get_duration(ast, len); ast->cum_len += get_duration(ast, len);
last_pos= pos; last_pos = pos;
}else{ } else {
int64_t offset, pos; int64_t offset, pos;
int duration; int duration;
offset = avio_rl64(pb); offset = avio_rl64(pb);
avio_rl32(pb); /* size */ avio_rl32(pb); /* size */
duration = avio_rl32(pb); duration = avio_rl32(pb);
if(url_feof(pb)) if (url_feof(pb))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
pos = avio_tell(pb); pos = avio_tell(pb);
if(avi->odml_depth > MAX_ODML_DEPTH){ if (avi->odml_depth > MAX_ODML_DEPTH) {
av_log(s, AV_LOG_ERROR, "Too deeply nested ODML indexes\n"); av_log(s, AV_LOG_ERROR, "Too deeply nested ODML indexes\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(avio_seek(pb, offset+8, SEEK_SET) < 0) if (avio_seek(pb, offset + 8, SEEK_SET) < 0)
return -1; return -1;
avi->odml_depth++; avi->odml_depth++;
read_braindead_odml_indx(s, frame_num); read_braindead_odml_indx(s, frame_num);
avi->odml_depth--; avi->odml_depth--;
frame_num += duration; frame_num += duration;
if(avio_seek(pb, pos, SEEK_SET) < 0) { if (avio_seek(pb, pos, SEEK_SET) < 0) {
av_log(s, AV_LOG_ERROR, "Failed to restore position after reading index\n"); av_log(s, AV_LOG_ERROR, "Failed to restore position after reading index\n");
return -1; return -1;
} }
} }
} }
avi->index_loaded=2; avi->index_loaded = 2;
return 0; return 0;
} }
static void clean_index(AVFormatContext *s){ static void clean_index(AVFormatContext *s)
{
int i; int i;
int64_t j; int64_t j;
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
AVIStream *ast = st->priv_data; AVIStream *ast = st->priv_data;
int n= st->nb_index_entries; int n = st->nb_index_entries;
int max= ast->sample_size; int max = ast->sample_size;
int64_t pos, size, ts; int64_t pos, size, ts;
if(n != 1 || ast->sample_size==0) if (n != 1 || ast->sample_size == 0)
continue; continue;
while(max < 1024) max+=max; while (max < 1024)
max += max;
pos= st->index_entries[0].pos; pos = st->index_entries[0].pos;
size= st->index_entries[0].size; size = st->index_entries[0].size;
ts= st->index_entries[0].timestamp; ts = st->index_entries[0].timestamp;
for(j=0; j<size; j+=max){ for (j = 0; j < size; j += max)
av_add_index_entry(st, pos+j, ts+j, FFMIN(max, size-j), 0, AVINDEX_KEYFRAME); av_add_index_entry(st, pos + j, ts + j, FFMIN(max, size - j), 0,
} AVINDEX_KEYFRAME);
} }
} }
static int avi_read_tag(AVFormatContext *s, AVStream *st, uint32_t tag, uint32_t size) static int avi_read_tag(AVFormatContext *s, AVStream *st, uint32_t tag,
uint32_t size)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
char key[5] = {0}, *value; char key[5] = { 0 };
char *value;
size += (size & 1); size += (size & 1);
if (size == UINT_MAX) if (size == UINT_MAX)
return AVERROR(EINVAL); return AVERROR(EINVAL);
value = av_malloc(size+1); value = av_malloc(size + 1);
if (!value) if (!value)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avio_read(pb, value, size); avio_read(pb, value, size);
value[size]=0; value[size] = 0;
AV_WL32(key, tag); AV_WL32(key, tag);
return av_dict_set(st ? &st->metadata : &s->metadata, key, value, return av_dict_set(st ? &st->metadata : &s->metadata, key, value,
AV_DICT_DONT_STRDUP_VAL); AV_DICT_DONT_STRDUP_VAL);
} }
static const char months[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", static const char months[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
...@@ -303,10 +321,10 @@ static void avi_metadata_creation_time(AVDictionary **metadata, char *date) ...@@ -303,10 +321,10 @@ static void avi_metadata_creation_time(AVDictionary **metadata, char *date)
/* parse standard AVI date format (ie. "Mon Mar 10 15:04:43 2003") */ /* parse standard AVI date format (ie. "Mon Mar 10 15:04:43 2003") */
if (sscanf(date, "%*3s%*[ ]%3s%*[ ]%2d%*[ ]%8s%*[ ]%4d", if (sscanf(date, "%*3s%*[ ]%3s%*[ ]%2d%*[ ]%8s%*[ ]%4d",
month, &day, time, &year) == 4) { month, &day, time, &year) == 4) {
for (i=0; i<12; i++) for (i = 0; i < 12; i++)
if (!av_strcasecmp(month, months[i])) { if (!av_strcasecmp(month, months[i])) {
snprintf(buffer, sizeof(buffer), "%.4d-%.2d-%.2d %s", snprintf(buffer, sizeof(buffer), "%.4d-%.2d-%.2d %s",
year, i+1, day, time); year, i + 1, day, time);
av_dict_set(metadata, "creation_time", buffer, 0); av_dict_set(metadata, "creation_time", buffer, 0);
} }
} else if (date[4] == '/' && date[7] == '/') { } else if (date[4] == '/' && date[7] == '/') {
...@@ -321,19 +339,25 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end) ...@@ -321,19 +339,25 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end)
uint32_t tag = avio_rl32(s->pb); uint32_t tag = avio_rl32(s->pb);
uint32_t size = avio_rl32(s->pb); uint32_t size = avio_rl32(s->pb);
switch (tag) { switch (tag) {
case MKTAG('n', 'c', 't', 'g'): { /* Nikon Tags */ case MKTAG('n', 'c', 't', 'g'): /* Nikon Tags */
{
uint64_t tag_end = avio_tell(s->pb) + size; uint64_t tag_end = avio_tell(s->pb) + size;
while (avio_tell(s->pb) < tag_end) { while (avio_tell(s->pb) < tag_end) {
uint16_t tag = avio_rl16(s->pb); uint16_t tag = avio_rl16(s->pb);
uint16_t size = avio_rl16(s->pb); uint16_t size = avio_rl16(s->pb);
const char *name = NULL; const char *name = NULL;
char buffer[64] = {0}; char buffer[64] = { 0 };
size -= avio_read(s->pb, buffer, size -= avio_read(s->pb, buffer,
FFMIN(size, sizeof(buffer)-1)); FFMIN(size, sizeof(buffer) - 1));
switch (tag) { switch (tag) {
case 0x03: name = "maker"; break; case 0x03:
case 0x04: name = "model"; break; name = "maker";
case 0x13: name = "creation_time"; break;
case 0x04:
name = "model";
break;
case 0x13:
name = "creation_time";
if (buffer[4] == ':' && buffer[7] == ':') if (buffer[4] == ':' && buffer[7] == ':')
buffer[4] = buffer[7] = '-'; buffer[4] = buffer[7] = '-';
break; break;
...@@ -360,14 +384,14 @@ static int avi_read_header(AVFormatContext *s) ...@@ -360,14 +384,14 @@ static int avi_read_header(AVFormatContext *s)
unsigned int size; unsigned int size;
int i; int i;
AVStream *st; AVStream *st;
AVIStream *ast = NULL; AVIStream *ast = NULL;
int avih_width=0, avih_height=0; int avih_width = 0, avih_height = 0;
int amv_file_format=0; int amv_file_format = 0;
uint64_t list_end = 0; uint64_t list_end = 0;
int ret; int ret;
AVDictionaryEntry *dict_entry; AVDictionaryEntry *dict_entry;
avi->stream_index= -1; avi->stream_index = -1;
ret = get_riff(s, pb); ret = get_riff(s, pb);
if (ret < 0) if (ret < 0)
...@@ -376,22 +400,22 @@ static int avi_read_header(AVFormatContext *s) ...@@ -376,22 +400,22 @@ static int avi_read_header(AVFormatContext *s)
av_log(avi, AV_LOG_DEBUG, "use odml:%d\n", avi->use_odml); av_log(avi, AV_LOG_DEBUG, "use odml:%d\n", avi->use_odml);
avi->io_fsize = avi->fsize = avio_size(pb); avi->io_fsize = avi->fsize = avio_size(pb);
if(avi->fsize<=0 || avi->fsize < avi->riff_end) if (avi->fsize <= 0 || avi->fsize < avi->riff_end)
avi->fsize= avi->riff_end == 8 ? INT64_MAX : avi->riff_end; avi->fsize = avi->riff_end == 8 ? INT64_MAX : avi->riff_end;
/* first list tag */ /* first list tag */
stream_index = -1; stream_index = -1;
codec_type = -1; codec_type = -1;
frame_period = 0; frame_period = 0;
for(;;) { for (;;) {
if (url_feof(pb)) if (url_feof(pb))
goto fail; goto fail;
tag = avio_rl32(pb); tag = avio_rl32(pb);
size = avio_rl32(pb); size = avio_rl32(pb);
print_tag("tag", tag, size); print_tag("tag", tag, size);
switch(tag) { switch (tag) {
case MKTAG('L', 'I', 'S', 'T'): case MKTAG('L', 'I', 'S', 'T'):
list_end = avio_tell(pb) + size; list_end = avio_tell(pb) + size;
/* Ignored, except at start of video packets. */ /* Ignored, except at start of video packets. */
...@@ -401,21 +425,23 @@ static int avi_read_header(AVFormatContext *s) ...@@ -401,21 +425,23 @@ static int avi_read_header(AVFormatContext *s)
if (tag1 == MKTAG('m', 'o', 'v', 'i')) { if (tag1 == MKTAG('m', 'o', 'v', 'i')) {
avi->movi_list = avio_tell(pb) - 4; avi->movi_list = avio_tell(pb) - 4;
if(size) avi->movi_end = avi->movi_list + size + (size & 1); if (size)
else avi->movi_end = avi->fsize; avi->movi_end = avi->movi_list + size + (size & 1);
else
avi->movi_end = avi->fsize;
av_dlog(NULL, "movi end=%"PRIx64"\n", avi->movi_end); av_dlog(NULL, "movi end=%"PRIx64"\n", avi->movi_end);
goto end_of_header; goto end_of_header;
} } else if (tag1 == MKTAG('I', 'N', 'F', 'O'))
else if (tag1 == MKTAG('I', 'N', 'F', 'O'))
ff_read_riff_info(s, size - 4); ff_read_riff_info(s, size - 4);
else if (tag1 == MKTAG('n', 'c', 'd', 't')) else if (tag1 == MKTAG('n', 'c', 'd', 't'))
avi_read_nikon(s, list_end); avi_read_nikon(s, list_end);
break; break;
case MKTAG('I', 'D', 'I', 'T'): { case MKTAG('I', 'D', 'I', 'T'):
unsigned char date[64] = {0}; {
unsigned char date[64] = { 0 };
size += (size & 1); size += (size & 1);
size -= avio_read(pb, date, FFMIN(size, sizeof(date)-1)); size -= avio_read(pb, date, FFMIN(size, sizeof(date) - 1));
avio_skip(pb, size); avio_skip(pb, size);
avi_metadata_creation_time(&s->metadata, date); avi_metadata_creation_time(&s->metadata, date);
break; break;
...@@ -425,7 +451,7 @@ static int avi_read_header(AVFormatContext *s) ...@@ -425,7 +451,7 @@ static int avi_read_header(AVFormatContext *s)
avio_skip(pb, size + (size & 1)); avio_skip(pb, size + (size & 1));
break; break;
case MKTAG('a', 'm', 'v', 'h'): case MKTAG('a', 'm', 'v', 'h'):
amv_file_format=1; amv_file_format = 1;
case MKTAG('a', 'v', 'i', 'h'): case MKTAG('a', 'v', 'i', 'h'):
/* AVI header */ /* AVI header */
/* using frame_period is bad idea */ /* using frame_period is bad idea */
...@@ -437,51 +463,51 @@ static int avi_read_header(AVFormatContext *s) ...@@ -437,51 +463,51 @@ static int avi_read_header(AVFormatContext *s)
avio_skip(pb, 2 * 4); avio_skip(pb, 2 * 4);
avio_rl32(pb); avio_rl32(pb);
avio_rl32(pb); avio_rl32(pb);
avih_width=avio_rl32(pb); avih_width = avio_rl32(pb);
avih_height=avio_rl32(pb); avih_height = avio_rl32(pb);
avio_skip(pb, size - 10 * 4); avio_skip(pb, size - 10 * 4);
break; break;
case MKTAG('s', 't', 'r', 'h'): case MKTAG('s', 't', 'r', 'h'):
/* stream header */ /* stream header */
tag1 = avio_rl32(pb); tag1 = avio_rl32(pb);
handler = avio_rl32(pb); /* codec tag */ handler = avio_rl32(pb); /* codec tag */
if(tag1 == MKTAG('p', 'a', 'd', 's')){ if (tag1 == MKTAG('p', 'a', 'd', 's')) {
avio_skip(pb, size - 8); avio_skip(pb, size - 8);
break; break;
}else{ } else {
stream_index++; stream_index++;
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
goto fail; goto fail;
st->id = stream_index; st->id = stream_index;
ast = av_mallocz(sizeof(AVIStream)); ast = av_mallocz(sizeof(AVIStream));
if (!ast) if (!ast)
goto fail; goto fail;
st->priv_data = ast; st->priv_data = ast;
} }
if(amv_file_format) if (amv_file_format)
tag1 = stream_index ? MKTAG('a','u','d','s') : MKTAG('v','i','d','s'); tag1 = stream_index ? MKTAG('a', 'u', 'd', 's')
: MKTAG('v', 'i', 'd', 's');
print_tag("strh", tag1, -1); print_tag("strh", tag1, -1);
if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){ if (tag1 == MKTAG('i', 'a', 'v', 's') ||
tag1 == MKTAG('i', 'v', 'a', 's')) {
int64_t dv_dur; int64_t dv_dur;
/* /* After some consideration -- I don't think we
* After some consideration -- I don't think we * have to support anything but DV in type1 AVIs. */
* have to support anything but DV in type1 AVIs.
*/
if (s->nb_streams != 1) if (s->nb_streams != 1)
goto fail; goto fail;
if (handler != MKTAG('d', 'v', 's', 'd') && if (handler != MKTAG('d', 'v', 's', 'd') &&
handler != MKTAG('d', 'v', 'h', 'd') && handler != MKTAG('d', 'v', 'h', 'd') &&
handler != MKTAG('d', 'v', 's', 'l')) handler != MKTAG('d', 'v', 's', 'l'))
goto fail; goto fail;
ast = s->streams[0]->priv_data; ast = s->streams[0]->priv_data;
av_freep(&s->streams[0]->codec->extradata); av_freep(&s->streams[0]->codec->extradata);
...@@ -499,46 +525,48 @@ static int avi_read_header(AVFormatContext *s) ...@@ -499,46 +525,48 @@ static int avi_read_header(AVFormatContext *s)
s->streams[0]->priv_data = ast; s->streams[0]->priv_data = ast;
avio_skip(pb, 3 * 4); avio_skip(pb, 3 * 4);
ast->scale = avio_rl32(pb); ast->scale = avio_rl32(pb);
ast->rate = avio_rl32(pb); ast->rate = avio_rl32(pb);
avio_skip(pb, 4); /* start time */ avio_skip(pb, 4); /* start time */
dv_dur = avio_rl32(pb); dv_dur = avio_rl32(pb);
if (ast->scale > 0 && ast->rate > 0 && dv_dur > 0) { if (ast->scale > 0 && ast->rate > 0 && dv_dur > 0) {
dv_dur *= AV_TIME_BASE; dv_dur *= AV_TIME_BASE;
s->duration = av_rescale(dv_dur, ast->scale, ast->rate); s->duration = av_rescale(dv_dur, ast->scale, ast->rate);
} }
/* /* else, leave duration alone; timing estimation in utils.c
* else, leave duration alone; timing estimation in utils.c * will make a guess based on bitrate. */
* will make a guess based on bitrate.
*/
stream_index = s->nb_streams - 1; stream_index = s->nb_streams - 1;
avio_skip(pb, size - 9*4); avio_skip(pb, size - 9 * 4);
break; break;
} }
av_assert0(stream_index < s->nb_streams); av_assert0(stream_index < s->nb_streams);
st->codec->stream_codec_tag= handler; st->codec->stream_codec_tag = handler;
avio_rl32(pb); /* flags */ avio_rl32(pb); /* flags */
avio_rl16(pb); /* priority */ avio_rl16(pb); /* priority */
avio_rl16(pb); /* language */ avio_rl16(pb); /* language */
avio_rl32(pb); /* initial frame */ avio_rl32(pb); /* initial frame */
ast->scale = avio_rl32(pb); ast->scale = avio_rl32(pb);
ast->rate = avio_rl32(pb); ast->rate = avio_rl32(pb);
if(!(ast->scale && ast->rate)){ 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,
if(frame_period){ "scale/rate is %u/%u which is invalid. "
ast->rate = 1000000; "(This file has been generated by broken software.)\n",
ast->scale,
ast->rate);
if (frame_period) {
ast->rate = 1000000;
ast->scale = frame_period; ast->scale = frame_period;
}else{ } else {
ast->rate = 25; ast->rate = 25;
ast->scale = 1; ast->scale = 1;
} }
} }
avpriv_set_pts_info(st, 64, ast->scale, ast->rate); avpriv_set_pts_info(st, 64, ast->scale, ast->rate);
ast->cum_len=avio_rl32(pb); /* start */ ast->cum_len = avio_rl32(pb); /* start */
st->nb_frames = avio_rl32(pb); st->nb_frames = avio_rl32(pb);
st->start_time = 0; st->start_time = 0;
...@@ -549,11 +577,11 @@ static int avi_read_header(AVFormatContext *s) ...@@ -549,11 +577,11 @@ static int avi_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
ast->sample_size = avio_rl32(pb); /* sample ssize */ ast->sample_size = avio_rl32(pb); /* sample ssize */
ast->cum_len *= FFMAX(1, ast->sample_size); ast->cum_len *= FFMAX(1, ast->sample_size);
av_dlog(s, "%"PRIu32" %"PRIu32" %d\n", av_dlog(s, "%"PRIu32" %"PRIu32" %d\n",
ast->rate, ast->scale, ast->sample_size); ast->rate, ast->scale, ast->sample_size);
switch(tag1) { switch (tag1) {
case MKTAG('v', 'i', 'd', 's'): case MKTAG('v', 'i', 'd', 's'):
codec_type = AVMEDIA_TYPE_VIDEO; codec_type = AVMEDIA_TYPE_VIDEO;
...@@ -571,14 +599,14 @@ static int avi_read_header(AVFormatContext *s) ...@@ -571,14 +599,14 @@ static int avi_read_header(AVFormatContext *s)
default: default:
av_log(s, AV_LOG_INFO, "unknown stream type %X\n", tag1); av_log(s, AV_LOG_INFO, "unknown stream type %X\n", tag1);
} }
if(ast->sample_size == 0) { if (ast->sample_size == 0) {
st->duration = st->nb_frames; st->duration = st->nb_frames;
if (st->duration > 0 && avi->io_fsize > 0 && avi->riff_end > avi->io_fsize) { if (st->duration > 0 && avi->io_fsize > 0 && avi->riff_end > avi->io_fsize) {
av_log(s, AV_LOG_DEBUG, "File is truncated adjusting duration\n"); av_log(s, AV_LOG_DEBUG, "File is truncated adjusting duration\n");
st->duration = av_rescale(st->duration, avi->io_fsize, avi->riff_end); st->duration = av_rescale(st->duration, avi->io_fsize, avi->riff_end);
} }
} }
ast->frame_offset= ast->cum_len; ast->frame_offset = ast->cum_len;
avio_skip(pb, size - 12 * 4); avio_skip(pb, size - 12 * 4);
break; break;
case MKTAG('s', 't', 'r', 'f'): case MKTAG('s', 't', 'r', 'f'):
...@@ -593,49 +621,59 @@ static int avi_read_header(AVFormatContext *s) ...@@ -593,49 +621,59 @@ static int avi_read_header(AVFormatContext *s)
if (cur_pos < list_end) if (cur_pos < list_end)
size = FFMIN(size, list_end - cur_pos); size = FFMIN(size, list_end - cur_pos);
st = s->streams[stream_index]; st = s->streams[stream_index];
switch(codec_type) { switch (codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
if(amv_file_format){ if (amv_file_format) {
st->codec->width=avih_width; st->codec->width = avih_width;
st->codec->height=avih_height; st->codec->height = avih_height;
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = AV_CODEC_ID_AMV; st->codec->codec_id = AV_CODEC_ID_AMV;
avio_skip(pb, size); avio_skip(pb, size);
break; break;
} }
tag1 = ff_get_bmp_header(pb, st, &esize); tag1 = ff_get_bmp_header(pb, st, &esize);
if (tag1 == MKTAG('D', 'X', 'S', 'B') || tag1 == MKTAG('D','X','S','A')) { if (tag1 == MKTAG('D', 'X', 'S', 'B') ||
tag1 == MKTAG('D', 'X', 'S', 'A')) {
st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
st->codec->codec_tag = tag1; st->codec->codec_tag = tag1;
st->codec->codec_id = AV_CODEC_ID_XSUB; st->codec->codec_id = AV_CODEC_ID_XSUB;
break; break;
} }
if(size > 10*4 && size<(1<<30) && size < avi->fsize){ if (size > 10 * 4 && size < (1 << 30) && size < avi->fsize) {
if(esize == size-1 && (esize&1)) st->codec->extradata_size= esize - 10*4; if (esize == size-1 && (esize&1)) {
else st->codec->extradata_size= size - 10*4; st->codec->extradata_size = esize - 10 * 4;
st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); } else
st->codec->extradata_size = size - 10 * 4;
st->codec->extradata = av_malloc(st->codec->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata) { if (!st->codec->extradata) {
st->codec->extradata_size= 0; st->codec->extradata_size = 0;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
avio_read(pb, st->codec->extradata, st->codec->extradata_size); avio_read(pb,
st->codec->extradata,
st->codec->extradata_size);
} }
if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly // FIXME: check if the encoder really did this correctly
if (st->codec->extradata_size & 1)
avio_r8(pb); avio_r8(pb);
/* Extract palette from extradata if bpp <= 8. */ /* Extract palette from extradata if bpp <= 8.
/* This code assumes that extradata contains only palette. */ * This code assumes that extradata contains only palette.
/* This is true for all paletted codecs implemented in FFmpeg. */ * This is true for all paletted codecs implemented in
if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { * FFmpeg. */
if (st->codec->extradata_size &&
(st->codec->bits_per_coded_sample <= 8)) {
int pal_size = (1 << st->codec->bits_per_coded_sample) << 2; int pal_size = (1 << st->codec->bits_per_coded_sample) << 2;
const uint8_t *pal_src; const uint8_t *pal_src;
pal_size = FFMIN(pal_size, st->codec->extradata_size); pal_size = FFMIN(pal_size, st->codec->extradata_size);
pal_src = st->codec->extradata + st->codec->extradata_size - pal_size; pal_src = st->codec->extradata +
for (i = 0; i < pal_size/4; i++) st->codec->extradata_size - pal_size;
for (i = 0; i < pal_size / 4; i++)
ast->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i); ast->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i);
ast->has_pal = 1; ast->has_pal = 1;
} }
...@@ -643,17 +681,25 @@ static int avi_read_header(AVFormatContext *s) ...@@ -643,17 +681,25 @@ static int avi_read_header(AVFormatContext *s)
print_tag("video", tag1, 0); print_tag("video", tag1, 0);
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_tag = tag1; st->codec->codec_tag = tag1;
st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags,
st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts. tag1);
/* This is needed to get the pict type which is necessary
if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){ * for generating correct pts. */
st->codec->extradata_size+= 9; st->need_parsing = AVSTREAM_PARSE_HEADERS;
st->codec->extradata= av_realloc_f(st->codec->extradata, 1, st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
if(st->codec->extradata) if (st->codec->codec_tag == 0 && st->codec->height > 0 &&
memcpy(st->codec->extradata + st->codec->extradata_size - 9, "BottomUp", 9); st->codec->extradata_size < 1U << 30) {
st->codec->extradata_size += 9;
st->codec->extradata = av_realloc_f(st->codec->extradata,
1,
st->codec->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
if (st->codec->extradata)
memcpy(st->codec->extradata + st->codec->extradata_size - 9,
"BottomUp", 9);
} }
st->codec->height= FFABS(st->codec->height); st->codec->height = FFABS(st->codec->height);
// avio_skip(pb, size - 5 * 4); // avio_skip(pb, size - 5 * 4);
break; break;
...@@ -661,12 +707,19 @@ static int avi_read_header(AVFormatContext *s) ...@@ -661,12 +707,19 @@ static int avi_read_header(AVFormatContext *s)
ret = ff_get_wav_header(pb, st->codec, size); ret = ff_get_wav_header(pb, st->codec, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
ast->dshow_block_align= st->codec->block_align; ast->dshow_block_align = st->codec->block_align;
if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){ if (ast->sample_size && st->codec->block_align &&
av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align); ast->sample_size != st->codec->block_align) {
ast->sample_size= st->codec->block_align; av_log(s,
AV_LOG_WARNING,
"sample size (%d) != block align (%d)\n",
ast->sample_size,
st->codec->block_align);
ast->sample_size = st->codec->block_align;
} }
if (size&1) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */ /* 2-aligned
* (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */
if (size & 1)
avio_skip(pb, 1); avio_skip(pb, 1);
/* Force parsing as several audio frames can be in /* 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. */
...@@ -674,24 +727,25 @@ static int avi_read_header(AVFormatContext *s) ...@@ -674,24 +727,25 @@ static int avi_read_header(AVFormatContext *s)
/* ADTS header is in extradata, AAC without header must be /* ADTS header is in extradata, AAC without header must be
* stored as exact frames. Parser not needed and it will * stored as exact frames. Parser not needed and it will
* fail. */ * fail. */
if (st->codec->codec_id == AV_CODEC_ID_AAC && st->codec->extradata_size) if (st->codec->codec_id == AV_CODEC_ID_AAC &&
st->codec->extradata_size)
st->need_parsing = AVSTREAM_PARSE_NONE; st->need_parsing = AVSTREAM_PARSE_NONE;
/* AVI files with Xan DPCM audio (wrongly) declare PCM /* AVI files with Xan DPCM audio (wrongly) declare PCM
* audio in the header but have Axan as stream_code_tag. */ * audio in the header but have Axan as stream_code_tag. */
if (st->codec->stream_codec_tag == AV_RL32("Axan")){ if (st->codec->stream_codec_tag == AV_RL32("Axan")) {
st->codec->codec_id = AV_CODEC_ID_XAN_DPCM; st->codec->codec_id = AV_CODEC_ID_XAN_DPCM;
st->codec->codec_tag = 0; st->codec->codec_tag = 0;
ast->dshow_block_align = 0; ast->dshow_block_align = 0;
} }
if (amv_file_format){ if (amv_file_format) {
st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV; st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV;
ast->dshow_block_align = 0; ast->dshow_block_align = 0;
} }
if(st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align <= 4 && ast->dshow_block_align) { if (st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align <= 4 && ast->dshow_block_align) {
av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align); av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align);
ast->dshow_block_align = 0; ast->dshow_block_align = 0;
} }
if(st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 1024 && ast->sample_size == 1024 || if (st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 1024 && ast->sample_size == 1024 ||
st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 4096 && ast->sample_size == 4096 || st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 4096 && ast->sample_size == 4096 ||
st->codec->codec_id == AV_CODEC_ID_MP3 && ast->dshow_block_align == 1152 && ast->sample_size == 1152) { st->codec->codec_id == AV_CODEC_ID_MP3 && ast->dshow_block_align == 1152 && ast->sample_size == 1152) {
av_log(s, AV_LOG_DEBUG, "overriding sample_size\n"); av_log(s, AV_LOG_DEBUG, "overriding sample_size\n");
...@@ -705,8 +759,8 @@ static int avi_read_header(AVFormatContext *s) ...@@ -705,8 +759,8 @@ static int avi_read_header(AVFormatContext *s)
break; break;
default: default:
st->codec->codec_type = AVMEDIA_TYPE_DATA; st->codec->codec_type = AVMEDIA_TYPE_DATA;
st->codec->codec_id= AV_CODEC_ID_NONE; st->codec->codec_id = AV_CODEC_ID_NONE;
st->codec->codec_tag= 0; st->codec->codec_tag = 0;
avio_skip(pb, size); avio_skip(pb, size);
break; break;
} }
...@@ -723,7 +777,7 @@ static int avi_read_header(AVFormatContext *s) ...@@ -723,7 +777,7 @@ static int avi_read_header(AVFormatContext *s)
size = FFMIN(size, list_end - cur_pos); size = FFMIN(size, list_end - cur_pos);
st = s->streams[stream_index]; st = s->streams[stream_index];
if(size<(1<<30)){ if (size<(1<<30)) {
st->codec->extradata_size= size; st->codec->extradata_size= size;
st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata) { if (!st->codec->extradata) {
...@@ -733,19 +787,21 @@ static int avi_read_header(AVFormatContext *s) ...@@ -733,19 +787,21 @@ static int avi_read_header(AVFormatContext *s)
avio_read(pb, st->codec->extradata, st->codec->extradata_size); avio_read(pb, st->codec->extradata, st->codec->extradata_size);
} }
if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly if (st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly
avio_r8(pb); avio_r8(pb);
} }
break; break;
case MKTAG('i', 'n', 'd', 'x'): case MKTAG('i', 'n', 'd', 'x'):
i= avio_tell(pb); i = avio_tell(pb);
if(pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) && avi->use_odml && if (pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) &&
read_braindead_odml_indx(s, 0) < 0 && (s->error_recognition & AV_EF_EXPLODE)) avi->use_odml &&
read_braindead_odml_indx(s, 0) < 0 &&
(s->error_recognition & AV_EF_EXPLODE))
goto fail; goto fail;
avio_seek(pb, i+size, SEEK_SET); avio_seek(pb, i + size, SEEK_SET);
break; break;
case MKTAG('v', 'p', 'r', 'p'): case MKTAG('v', 'p', 'r', 'p'):
if(stream_index < (unsigned)s->nb_streams && size > 9*4){ if (stream_index < (unsigned)s->nb_streams && size > 9 * 4) {
AVRational active, active_aspect; AVRational active, active_aspect;
st = s->streams[stream_index]; st = s->streams[stream_index];
...@@ -755,33 +811,35 @@ static int avi_read_header(AVFormatContext *s) ...@@ -755,33 +811,35 @@ static int avi_read_header(AVFormatContext *s)
avio_rl32(pb); avio_rl32(pb);
avio_rl32(pb); avio_rl32(pb);
active_aspect.den= avio_rl16(pb); active_aspect.den = avio_rl16(pb);
active_aspect.num= avio_rl16(pb); active_aspect.num = avio_rl16(pb);
active.num = avio_rl32(pb); active.num = avio_rl32(pb);
active.den = avio_rl32(pb); active.den = avio_rl32(pb);
avio_rl32(pb); //nbFieldsPerFrame avio_rl32(pb); // nbFieldsPerFrame
if(active_aspect.num && active_aspect.den && active.num && active.den){ if (active_aspect.num && active_aspect.den &&
st->sample_aspect_ratio= av_div_q(active_aspect, active); active.num && active.den) {
st->sample_aspect_ratio = av_div_q(active_aspect, active);
av_dlog(s, "vprp %d/%d %d/%d\n", av_dlog(s, "vprp %d/%d %d/%d\n",
active_aspect.num, active_aspect.den, active_aspect.num, active_aspect.den,
active.num, active.den); active.num, active.den);
} }
size -= 9*4; size -= 9 * 4;
} }
avio_skip(pb, size); avio_skip(pb, size);
break; break;
case MKTAG('s', 't', 'r', 'n'): case MKTAG('s', 't', 'r', 'n'):
if(s->nb_streams){ if (s->nb_streams) {
ret = avi_read_tag(s, s->streams[s->nb_streams-1], tag, size); ret = avi_read_tag(s, s->streams[s->nb_streams - 1], tag, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
break; break;
} }
default: default:
if(size > 1000000){ if (size > 1000000) {
av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, " av_log(s, AV_LOG_ERROR,
"I will ignore it and try to continue anyway.\n"); "Something went wrong during header parsing, "
"I will ignore it and try to continue anyway.\n");
if (s->error_recognition & AV_EF_EXPLODE) if (s->error_recognition & AV_EF_EXPLODE)
goto fail; goto fail;
avi->movi_list = avio_tell(pb) - 4; avi->movi_list = avio_tell(pb) - 4;
...@@ -794,42 +852,45 @@ static int avi_read_header(AVFormatContext *s) ...@@ -794,42 +852,45 @@ static int avi_read_header(AVFormatContext *s)
break; break;
} }
} }
end_of_header:
end_of_header:
/* check stream number */ /* check stream number */
if (stream_index != s->nb_streams - 1) { if (stream_index != s->nb_streams - 1) {
fail:
fail:
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(!avi->index_loaded && pb->seekable) if (!avi->index_loaded && pb->seekable)
avi_load_index(s); avi_load_index(s);
avi->index_loaded |= 1; avi->index_loaded |= 1;
avi->non_interleaved |= guess_ni_flag(s) | (s->flags & AVFMT_FLAG_SORT_DTS); avi->non_interleaved |= guess_ni_flag(s) | (s->flags & AVFMT_FLAG_SORT_DTS);
dict_entry = av_dict_get(s->metadata, "ISFT", NULL, 0); dict_entry = av_dict_get(s->metadata, "ISFT", NULL, 0);
if (dict_entry && !strcmp(dict_entry->value, "PotEncoder")) if (dict_entry && !strcmp(dict_entry->value, "PotEncoder"))
for (i=0; i<s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
if ( st->codec->codec_id == AV_CODEC_ID_MPEG1VIDEO if ( st->codec->codec_id == AV_CODEC_ID_MPEG1VIDEO
|| st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO) || st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO)
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
} }
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
if(st->nb_index_entries) if (st->nb_index_entries)
break; break;
} }
// DV-in-AVI cannot be non-interleaved, if set this must be // DV-in-AVI cannot be non-interleaved, if set this must be
// a mis-detection. // a mis-detection.
if(avi->dv_demux) if (avi->dv_demux)
avi->non_interleaved=0; avi->non_interleaved = 0;
if(i==s->nb_streams && avi->non_interleaved) { if (i == s->nb_streams && avi->non_interleaved) {
av_log(s, AV_LOG_WARNING, "non-interleaved AVI without index, switching to interleaved\n"); av_log(s, AV_LOG_WARNING,
avi->non_interleaved=0; "Non-interleaved AVI without index, switching to interleaved\n");
avi->non_interleaved = 0;
} }
if(avi->non_interleaved) { 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); clean_index(s);
} }
...@@ -840,16 +901,17 @@ static int avi_read_header(AVFormatContext *s) ...@@ -840,16 +901,17 @@ static int avi_read_header(AVFormatContext *s)
return 0; return 0;
} }
static int read_gab2_sub(AVStream *st, AVPacket *pkt) { static int read_gab2_sub(AVStream *st, AVPacket *pkt)
if (pkt->data && !strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data+5) == 2) { {
if (pkt->data && !strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data + 5) == 2) {
uint8_t desc[256]; uint8_t desc[256];
int score = AVPROBE_SCORE_EXTENSION, ret; int score = AVPROBE_SCORE_EXTENSION, ret;
AVIStream *ast = st->priv_data; AVIStream *ast = st->priv_data;
AVInputFormat *sub_demuxer; AVInputFormat *sub_demuxer;
AVRational time_base; AVRational time_base;
AVIOContext *pb = avio_alloc_context( pkt->data + 7, AVIOContext *pb = avio_alloc_context(pkt->data + 7,
pkt->size - 7, pkt->size - 7,
0, NULL, NULL, NULL, NULL); 0, NULL, NULL, NULL, NULL);
AVProbeData pd; AVProbeData pd;
unsigned int desc_len = avio_rl32(pb); unsigned int desc_len = avio_rl32(pb);
...@@ -864,14 +926,15 @@ static int read_gab2_sub(AVStream *st, AVPacket *pkt) { ...@@ -864,14 +926,15 @@ static int read_gab2_sub(AVStream *st, AVPacket *pkt) {
avio_rl16(pb); /* flags? */ avio_rl16(pb); /* flags? */
avio_rl32(pb); /* data size */ avio_rl32(pb); /* data size */
pd = (AVProbeData) { .buf = pb->buf_ptr, .buf_size = pb->buf_end - pb->buf_ptr }; pd = (AVProbeData) { .buf = pb->buf_ptr,
.buf_size = pb->buf_end - pb->buf_ptr };
if (!(sub_demuxer = av_probe_input_format2(&pd, 1, &score))) if (!(sub_demuxer = av_probe_input_format2(&pd, 1, &score)))
goto error; goto error;
if (!(ast->sub_ctx = avformat_alloc_context())) if (!(ast->sub_ctx = avformat_alloc_context()))
goto error; goto error;
ast->sub_ctx->pb = pb; ast->sub_ctx->pb = pb;
if (!avformat_open_input(&ast->sub_ctx, "", sub_demuxer, NULL)) { if (!avformat_open_input(&ast->sub_ctx, "", sub_demuxer, NULL)) {
ff_read_packet(ast->sub_ctx, &ast->sub_pkt); ff_read_packet(ast->sub_ctx, &ast->sub_pkt);
*st->codec = *ast->sub_ctx->streams[0]->codec; *st->codec = *ast->sub_ctx->streams[0]->codec;
...@@ -882,6 +945,7 @@ static int read_gab2_sub(AVStream *st, AVPacket *pkt) { ...@@ -882,6 +945,7 @@ static int read_gab2_sub(AVStream *st, AVPacket *pkt) {
ast->sub_buffer = pkt->data; ast->sub_buffer = pkt->data;
memset(pkt, 0, sizeof(*pkt)); memset(pkt, 0, sizeof(*pkt));
return 1; return 1;
error: error:
av_freep(&pb); av_freep(&pb);
} }
...@@ -899,7 +963,7 @@ static AVStream *get_subtitle_pkt(AVFormatContext *s, AVStream *next_st, ...@@ -899,7 +963,7 @@ static AVStream *get_subtitle_pkt(AVFormatContext *s, AVStream *next_st,
next_ts = av_rescale_q(next_ast->frame_offset, next_st->time_base, next_ts = av_rescale_q(next_ast->frame_offset, next_st->time_base,
AV_TIME_BASE_Q); AV_TIME_BASE_Q);
for (i=0; i<s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i]; st = s->streams[i];
ast = st->priv_data; ast = st->priv_data;
if (st->discard < AVDISCARD_ALL && ast && ast->sub_pkt.data) { if (st->discard < AVDISCARD_ALL && ast && ast->sub_pkt.data) {
...@@ -912,21 +976,23 @@ static AVStream *get_subtitle_pkt(AVFormatContext *s, AVStream *next_st, ...@@ -912,21 +976,23 @@ static AVStream *get_subtitle_pkt(AVFormatContext *s, AVStream *next_st,
} }
if (sub_st) { if (sub_st) {
ast = sub_st->priv_data; ast = sub_st->priv_data;
*pkt = ast->sub_pkt; *pkt = ast->sub_pkt;
pkt->stream_index = sub_st->index; pkt->stream_index = sub_st->index;
if (ff_read_packet(ast->sub_ctx, &ast->sub_pkt) < 0) if (ff_read_packet(ast->sub_ctx, &ast->sub_pkt) < 0)
ast->sub_pkt.data = NULL; ast->sub_pkt.data = NULL;
} }
return sub_st; return sub_st;
} }
static int get_stream_idx(int *d){ static int get_stream_idx(int *d)
if( d[0] >= '0' && d[0] <= '9' {
&& d[1] >= '0' && d[1] <= '9'){ if (d[0] >= '0' && d[0] <= '9' &&
d[1] >= '0' && d[1] <= '9') {
return (d[0] - '0') * 10 + (d[1] - '0'); return (d[0] - '0') * 10 + (d[1] - '0');
}else{ } else {
return 100; //invalid stream ID return 100; // invalid stream ID
} }
} }
...@@ -945,52 +1011,53 @@ static int avi_sync(AVFormatContext *s, int exit_early) ...@@ -945,52 +1011,53 @@ static int avi_sync(AVFormatContext *s, int exit_early)
start_sync: start_sync:
memset(d, -1, sizeof(d)); memset(d, -1, sizeof(d));
for(i=sync=avio_tell(pb); !url_feof(pb); i++) { for (i = sync = avio_tell(pb); !url_feof(pb); i++) {
int j; int j;
for(j=0; j<7; j++) for (j = 0; j < 7; j++)
d[j]= d[j+1]; d[j] = d[j + 1];
d[7]= avio_r8(pb); d[7] = avio_r8(pb);
size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24); size = d[4] + (d[5] << 8) + (d[6] << 16) + (d[7] << 24);
n= get_stream_idx(d+2); n = get_stream_idx(d + 2);
av_dlog(s, "%X %X %X %X %X %X %X %X %"PRId64" %u %d\n", av_dlog(s, "%X %X %X %X %X %X %X %X %"PRId64" %u %d\n",
d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n); d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
if(i*(avi->io_fsize>0) + (uint64_t)size > avi->fsize || d[0] > 127) if (i*(avi->io_fsize>0) + (uint64_t)size > avi->fsize || d[0] > 127)
continue; continue;
//parse ix## // parse ix##
if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) if ((d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) ||
//parse JUNK // parse JUNK
||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K') (d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K') ||
||(d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')){ (d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')) {
avio_skip(pb, size); avio_skip(pb, size);
goto start_sync; goto start_sync;
} }
//parse stray LIST // parse stray LIST
if(d[0] == 'L' && d[1] == 'I' && d[2] == 'S' && d[3] == 'T'){ if (d[0] == 'L' && d[1] == 'I' && d[2] == 'S' && d[3] == 'T') {
avio_skip(pb, 4); avio_skip(pb, 4);
goto start_sync; goto start_sync;
} }
n= get_stream_idx(d); n = get_stream_idx(d);
if(!((i-avi->last_pkt_pos)&1) && get_stream_idx(d+1) < s->nb_streams) if (!((i - avi->last_pkt_pos) & 1) &&
get_stream_idx(d + 1) < s->nb_streams)
continue; continue;
//detect ##ix chunk and skip // detect ##ix chunk and skip
if(d[2] == 'i' && d[3] == 'x' && n < s->nb_streams){ if (d[2] == 'i' && d[3] == 'x' && n < s->nb_streams) {
avio_skip(pb, size); avio_skip(pb, size);
goto start_sync; goto start_sync;
} }
//parse ##dc/##wb // parse ##dc/##wb
if(n < s->nb_streams){ if (n < s->nb_streams) {
AVStream *st; AVStream *st;
AVIStream *ast; AVIStream *ast;
st = s->streams[n]; st = s->streams[n];
ast = st->priv_data; ast = st->priv_data;
if (!ast) { if (!ast) {
...@@ -998,28 +1065,28 @@ start_sync: ...@@ -998,28 +1065,28 @@ start_sync:
continue; continue;
} }
if(s->nb_streams>=2){ if (s->nb_streams >= 2) {
AVStream *st1 = s->streams[1]; AVStream *st1 = s->streams[1];
AVIStream *ast1= st1->priv_data; AVIStream *ast1 = st1->priv_data;
//workaround for broken small-file-bug402.avi // workaround for broken small-file-bug402.avi
if( d[2] == 'w' && d[3] == 'b' if ( d[2] == 'w' && d[3] == 'b'
&& n==0 && n == 0
&& st ->codec->codec_type == AVMEDIA_TYPE_VIDEO && st ->codec->codec_type == AVMEDIA_TYPE_VIDEO
&& st1->codec->codec_type == AVMEDIA_TYPE_AUDIO && st1->codec->codec_type == AVMEDIA_TYPE_AUDIO
&& ast->prefix == 'd'*256+'c' && ast->prefix == 'd'*256+'c'
&& (d[2]*256+d[3] == ast1->prefix || !ast1->prefix_count) && (d[2]*256+d[3] == ast1->prefix || !ast1->prefix_count)
){ ) {
n=1; n = 1;
st = st1; st = st1;
ast = ast1; 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");
} }
} }
if ((st->discard >= AVDISCARD_DEFAULT && size == 0)
if( (st->discard >= AVDISCARD_DEFAULT && size==0) /* || (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY)) */ // FIXME: needs a little reordering
/*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY))*/ //FIXME needs a little reordering || st->discard >= AVDISCARD_ALL) {
|| st->discard >= AVDISCARD_ALL){
if (!exit_early) { if (!exit_early) {
ast->frame_offset += get_duration(ast, size); ast->frame_offset += get_duration(ast, size);
avio_skip(pb, size); avio_skip(pb, size);
...@@ -1027,38 +1094,42 @@ start_sync: ...@@ -1027,38 +1094,42 @@ start_sync:
} }
} }
if (d[2] == 'p' && d[3] == 'c' && size<=4*256+4) { if (d[2] == 'p' && d[3] == 'c' && size <= 4 * 256 + 4) {
int k = avio_r8(pb); int k = avio_r8(pb);
int last = (k + avio_r8(pb) - 1) & 0xFF; int last = (k + avio_r8(pb) - 1) & 0xFF;
avio_rl16(pb); //flags avio_rl16(pb); // flags
// b + (g << 8) + (r << 16);
for (; k <= last; k++) for (; k <= last; k++)
ast->pal[k] = 0xFFU<<24 | avio_rb32(pb)>>8;// b + (g << 8) + (r << 16); ast->pal[k] = 0xFFU<<24 | avio_rb32(pb)>>8;
ast->has_pal= 1;
goto start_sync;
} else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) ||
d[2]*256+d[3] == ast->prefix /*||
(d[2] == 'd' && d[3] == 'c') ||
(d[2] == 'w' && d[3] == 'b')*/) {
ast->has_pal = 1;
goto start_sync;
} else if (((ast->prefix_count < 5 || sync + 9 > i) &&
d[2] < 128 && d[3] < 128) ||
d[2] * 256 + d[3] == ast->prefix /* ||
(d[2] == 'd' && d[3] == 'c') ||
(d[2] == 'w' && d[3] == 'b') */) {
if (exit_early) if (exit_early)
return 0; return 0;
if(d[2]*256+d[3] == ast->prefix) if (d[2] * 256 + d[3] == ast->prefix)
ast->prefix_count++; ast->prefix_count++;
else{ else {
ast->prefix= d[2]*256+d[3]; ast->prefix = d[2] * 256 + d[3];
ast->prefix_count= 0; ast->prefix_count = 0;
} }
avi->stream_index= n; avi->stream_index = n;
ast->packet_size= size + 8; ast->packet_size = size + 8;
ast->remaining= size; ast->remaining = size;
if(size || !ast->sample_size){ if (size || !ast->sample_size) {
uint64_t pos= avio_tell(pb) - 8; uint64_t pos = avio_tell(pb) - 8;
if(!st->index_entries || !st->nb_index_entries || st->index_entries[st->nb_index_entries - 1].pos < pos){ if (!st->index_entries || !st->nb_index_entries ||
av_add_index_entry(st, pos, ast->frame_offset, size, 0, AVINDEX_KEYFRAME); st->index_entries[st->nb_index_entries - 1].pos < pos) {
av_add_index_entry(st, pos, ast->frame_offset, size,
0, AVINDEX_KEYFRAME);
} }
} }
return 0; return 0;
...@@ -1066,7 +1137,7 @@ start_sync: ...@@ -1066,7 +1137,7 @@ start_sync:
} }
} }
if(pb->error) if (pb->error)
return pb->error; return pb->error;
return AVERROR_EOF; return AVERROR_EOF;
} }
...@@ -1077,7 +1148,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -1077,7 +1148,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int err; int err;
#if FF_API_DESTRUCT_PACKET #if FF_API_DESTRUCT_PACKET
void* dstr; void *dstr;
#endif #endif
if (CONFIG_DV_DEMUXER && avi->dv_demux) { if (CONFIG_DV_DEMUXER && avi->dv_demux) {
...@@ -1086,97 +1157,106 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -1086,97 +1157,106 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
return size; return size;
} }
if(avi->non_interleaved){ if (avi->non_interleaved) {
int best_stream_index = 0; int best_stream_index = 0;
AVStream *best_st= NULL; AVStream *best_st = NULL;
AVIStream *best_ast; AVIStream *best_ast;
int64_t best_ts= INT64_MAX; int64_t best_ts = INT64_MAX;
int i; int i;
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
AVIStream *ast = st->priv_data; AVIStream *ast = st->priv_data;
int64_t ts= ast->frame_offset; int64_t ts = ast->frame_offset;
int64_t last_ts; int64_t last_ts;
if(!st->nb_index_entries) if (!st->nb_index_entries)
continue; continue;
last_ts = st->index_entries[st->nb_index_entries - 1].timestamp; last_ts = st->index_entries[st->nb_index_entries - 1].timestamp;
if(!ast->remaining && ts > last_ts) if (!ast->remaining && ts > last_ts)
continue; continue;
ts = av_rescale_q(ts, st->time_base, (AVRational){FFMAX(1, ast->sample_size), AV_TIME_BASE}); ts = av_rescale_q(ts, st->time_base,
(AVRational) { FFMAX(1, ast->sample_size),
AV_TIME_BASE });
av_dlog(s, "%"PRId64" %d/%d %"PRId64"\n", ts, av_dlog(s, "%"PRId64" %d/%d %"PRId64"\n", ts,
st->time_base.num, st->time_base.den, ast->frame_offset); st->time_base.num, st->time_base.den, ast->frame_offset);
if(ts < best_ts){ if (ts < best_ts) {
best_ts= ts; best_ts = ts;
best_st= st; best_st = st;
best_stream_index= i; best_stream_index = i;
} }
} }
if(!best_st) if (!best_st)
return AVERROR_EOF; return AVERROR_EOF;
best_ast = best_st->priv_data; best_ast = best_st->priv_data;
best_ts = best_ast->frame_offset; best_ts = best_ast->frame_offset;
if(best_ast->remaining) if (best_ast->remaining) {
i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD); i = av_index_search_timestamp(best_st,
else{ best_ts,
i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY); AVSEEK_FLAG_ANY |
if(i>=0) AVSEEK_FLAG_BACKWARD);
best_ast->frame_offset= best_st->index_entries[i].timestamp; } 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;
} }
if(i>=0){ if (i >= 0) {
int64_t pos= best_st->index_entries[i].pos; int64_t pos = best_st->index_entries[i].pos;
pos += best_ast->packet_size - best_ast->remaining; pos += best_ast->packet_size - best_ast->remaining;
if(avio_seek(s->pb, pos + 8, SEEK_SET) < 0) if (avio_seek(s->pb, pos + 8, SEEK_SET) < 0)
return AVERROR_EOF; return AVERROR_EOF;
av_assert0(best_ast->remaining <= best_ast->packet_size); av_assert0(best_ast->remaining <= best_ast->packet_size);
avi->stream_index= best_stream_index; avi->stream_index = best_stream_index;
if(!best_ast->remaining) if (!best_ast->remaining)
best_ast->packet_size= best_ast->packet_size =
best_ast->remaining= best_st->index_entries[i].size; best_ast->remaining = best_st->index_entries[i].size;
} }
else else
return AVERROR_EOF; return AVERROR_EOF;
} }
resync: resync:
if(avi->stream_index >= 0){ if (avi->stream_index >= 0) {
AVStream *st= s->streams[ avi->stream_index ]; AVStream *st = s->streams[avi->stream_index];
AVIStream *ast= st->priv_data; AVIStream *ast = st->priv_data;
int size, err; int size, err;
if(get_subtitle_pkt(s, st, pkt)) if (get_subtitle_pkt(s, st, pkt))
return 0; return 0;
if(ast->sample_size <= 1) // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM
size= INT_MAX; if (ast->sample_size <= 1)
else if(ast->sample_size < 32) size = INT_MAX;
else if (ast->sample_size < 32)
// arbitrary multiplier to avoid tiny packets for raw PCM data // arbitrary multiplier to avoid tiny packets for raw PCM data
size= 1024*ast->sample_size; size = 1024 * ast->sample_size;
else else
size= ast->sample_size; size = ast->sample_size;
if(size > ast->remaining) if (size > ast->remaining)
size= ast->remaining; size = ast->remaining;
avi->last_pkt_pos= avio_tell(pb); avi->last_pkt_pos = avio_tell(pb);
err= av_get_packet(pb, pkt, size); err = av_get_packet(pb, pkt, size);
if(err<0) if (err < 0)
return err; return err;
size = err; size = err;
if(ast->has_pal && pkt->size<(unsigned)INT_MAX/2){ if (ast->has_pal && pkt->size < (unsigned)INT_MAX / 2) {
uint8_t *pal; uint8_t *pal;
pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE); pal = av_packet_new_side_data(pkt,
if(!pal){ AV_PKT_DATA_PALETTE,
av_log(s, AV_LOG_ERROR, "Failed to allocate data for palette\n"); AVPALETTE_SIZE);
}else{ if (!pal) {
av_log(s, AV_LOG_ERROR,
"Failed to allocate data for palette\n");
} else {
memcpy(pal, ast->pal, AVPALETTE_SIZE); memcpy(pal, ast->pal, AVPALETTE_SIZE);
ast->has_pal = 0; ast->has_pal = 0;
} }
...@@ -1188,29 +1268,37 @@ resync: ...@@ -1188,29 +1268,37 @@ resync:
dstr = pkt->destruct; dstr = pkt->destruct;
#endif #endif
size = avpriv_dv_produce_packet(avi->dv_demux, pkt, size = avpriv_dv_produce_packet(avi->dv_demux, pkt,
pkt->data, pkt->size, pkt->pos); pkt->data, pkt->size, pkt->pos);
#if FF_API_DESTRUCT_PACKET #if FF_API_DESTRUCT_PACKET
pkt->destruct = dstr; pkt->destruct = dstr;
#endif #endif
pkt->buf = avbuf; pkt->buf = avbuf;
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
if (size < 0) if (size < 0)
av_free_packet(pkt); av_free_packet(pkt);
} else if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE } else if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE &&
&& !st->codec->codec_tag && read_gab2_sub(st, pkt)) { !st->codec->codec_tag && read_gab2_sub(st, pkt)) {
ast->frame_offset++; ast->frame_offset++;
avi->stream_index = -1; avi->stream_index = -1;
ast->remaining = 0; ast->remaining = 0;
goto resync; goto resync;
} else { } 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->frame_offset;
// pkt->dts += ast->start; // pkt->dts += ast->start;
if(ast->sample_size) if (ast->sample_size)
pkt->dts /= ast->sample_size; pkt->dts /= ast->sample_size;
av_dlog(s, "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d base:%d st:%d size:%d\n", av_dlog(s,
pkt->dts, ast->frame_offset, ast->scale, ast->rate, "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d "
ast->sample_size, AV_TIME_BASE, avi->stream_index, size); "base:%d st:%d size:%d\n",
pkt->dts,
ast->frame_offset,
ast->scale,
ast->rate,
ast->sample_size,
AV_TIME_BASE,
avi->stream_index,
size);
pkt->stream_index = avi->stream_index; pkt->stream_index = avi->stream_index;
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
...@@ -1218,17 +1306,17 @@ resync: ...@@ -1218,17 +1306,17 @@ resync:
int index; int index;
av_assert0(st->index_entries); av_assert0(st->index_entries);
index= av_index_search_timestamp(st, ast->frame_offset, 0); index = av_index_search_timestamp(st, ast->frame_offset, 0);
e= &st->index_entries[index]; e = &st->index_entries[index];
if(index >= 0 && e->timestamp == ast->frame_offset){ if (index >= 0 && e->timestamp == ast->frame_offset) {
if (index == st->nb_index_entries-1){ if (index == st->nb_index_entries-1) {
int key=1; int key=1;
int i; int i;
uint32_t state=-1; uint32_t state=-1;
for(i=0; i<FFMIN(size,256); i++){ for (i=0; i<FFMIN(size,256); i++) {
if(st->codec->codec_id == AV_CODEC_ID_MPEG4){ if (st->codec->codec_id == AV_CODEC_ID_MPEG4) {
if(state == 0x1B6){ if (state == 0x1B6) {
key= !(pkt->data[i]&0xC0); key= !(pkt->data[i]&0xC0);
break; break;
} }
...@@ -1236,7 +1324,7 @@ resync: ...@@ -1236,7 +1324,7 @@ resync:
break; break;
state= (state<<8) + pkt->data[i]; state= (state<<8) + pkt->data[i];
} }
if(!key) if (!key)
e->flags &= ~AVINDEX_KEYFRAME; e->flags &= ~AVINDEX_KEYFRAME;
} }
if (e->flags & AVINDEX_KEYFRAME) if (e->flags & AVINDEX_KEYFRAME)
...@@ -1248,24 +1336,24 @@ resync: ...@@ -1248,24 +1336,24 @@ resync:
ast->frame_offset += get_duration(ast, pkt->size); ast->frame_offset += get_duration(ast, pkt->size);
} }
ast->remaining -= err; ast->remaining -= err;
if(!ast->remaining){ if (!ast->remaining) {
avi->stream_index= -1; avi->stream_index = -1;
ast->packet_size= 0; ast->packet_size = 0;
} }
if(!avi->non_interleaved && pkt->pos >= 0 && ast->seek_pos > pkt->pos){ if (!avi->non_interleaved && pkt->pos >= 0 && ast->seek_pos > pkt->pos) {
av_free_packet(pkt); av_free_packet(pkt);
goto resync; goto resync;
} }
ast->seek_pos= 0; ast->seek_pos= 0;
if(!avi->non_interleaved && st->nb_index_entries>1 && avi->index_loaded>1){ if (!avi->non_interleaved && st->nb_index_entries>1 && avi->index_loaded>1) {
int64_t dts= av_rescale_q(pkt->dts, st->time_base, AV_TIME_BASE_Q); int64_t dts= av_rescale_q(pkt->dts, st->time_base, AV_TIME_BASE_Q);
if(avi->dts_max - dts > 2*AV_TIME_BASE){ if (avi->dts_max - dts > 2*AV_TIME_BASE) {
avi->non_interleaved= 1; avi->non_interleaved= 1;
av_log(s, AV_LOG_INFO, "Switching to NI mode, due to poor interleaving\n"); av_log(s, AV_LOG_INFO, "Switching to NI mode, due to poor interleaving\n");
}else if(avi->dts_max < dts) }else if (avi->dts_max < dts)
avi->dts_max = dts; avi->dts_max = dts;
} }
...@@ -1278,7 +1366,7 @@ resync: ...@@ -1278,7 +1366,7 @@ resync:
} }
/* XXX: We make the implicit supposition that the positions are sorted /* XXX: We make the implicit supposition that the positions are sorted
for each stream. */ * for each stream. */
static int avi_read_idx1(AVFormatContext *s, int size) static int avi_read_idx1(AVFormatContext *s, int size)
{ {
AVIContext *avi = s->priv_data; AVIContext *avi = s->priv_data;
...@@ -1287,8 +1375,8 @@ static int avi_read_idx1(AVFormatContext *s, int size) ...@@ -1287,8 +1375,8 @@ static int avi_read_idx1(AVFormatContext *s, int size)
AVStream *st; AVStream *st;
AVIStream *ast; AVIStream *ast;
unsigned int index, tag, flags, pos, len, first_packet = 1; unsigned int index, tag, flags, pos, len, first_packet = 1;
unsigned last_pos= -1; unsigned last_pos = -1;
unsigned last_idx= -1; unsigned last_idx = -1;
int64_t idx1_pos, first_packet_pos = 0, data_offset = 0; int64_t idx1_pos, first_packet_pos = 0, data_offset = 0;
int anykey = 0; int anykey = 0;
...@@ -1297,39 +1385,38 @@ static int avi_read_idx1(AVFormatContext *s, int size) ...@@ -1297,39 +1385,38 @@ static int avi_read_idx1(AVFormatContext *s, int size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
idx1_pos = avio_tell(pb); idx1_pos = avio_tell(pb);
avio_seek(pb, avi->movi_list+4, SEEK_SET); avio_seek(pb, avi->movi_list + 4, SEEK_SET);
if (avi_sync(s, 1) == 0) { if (avi_sync(s, 1) == 0)
first_packet_pos = avio_tell(pb) - 8; first_packet_pos = avio_tell(pb) - 8;
}
avi->stream_index = -1; avi->stream_index = -1;
avio_seek(pb, idx1_pos, SEEK_SET); avio_seek(pb, idx1_pos, SEEK_SET);
if (s->nb_streams == 1 && s->streams[0]->codec->codec_tag == AV_RL32("MMES")){ if (s->nb_streams == 1 && s->streams[0]->codec->codec_tag == AV_RL32("MMES")) {
first_packet_pos = 0; first_packet_pos = 0;
data_offset = avi->movi_list; data_offset = avi->movi_list;
} }
/* 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++) { for (i = 0; i < nb_index_entries; i++) {
if(url_feof(pb)) if (url_feof(pb))
return -1; return -1;
tag = avio_rl32(pb); tag = avio_rl32(pb);
flags = avio_rl32(pb); flags = avio_rl32(pb);
pos = avio_rl32(pb); pos = avio_rl32(pb);
len = avio_rl32(pb); len = avio_rl32(pb);
av_dlog(s, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/", av_dlog(s, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/",
i, tag, flags, pos, len); i, tag, flags, pos, len);
index = ((tag & 0xff) - '0') * 10; index = ((tag & 0xff) - '0') * 10;
index += ((tag >> 8) & 0xff) - '0'; index += (tag >> 8 & 0xff) - '0';
if (index >= s->nb_streams) if (index >= s->nb_streams)
continue; continue;
st = s->streams[index]; st = s->streams[index];
ast = st->priv_data; ast = st->priv_data;
if(first_packet && first_packet_pos && len) { if (first_packet && first_packet_pos && len) {
data_offset = first_packet_pos - pos; data_offset = first_packet_pos - pos;
first_packet = 0; first_packet = 0;
} }
pos += data_offset; pos += data_offset;
...@@ -1338,15 +1425,16 @@ static int avi_read_idx1(AVFormatContext *s, int size) ...@@ -1338,15 +1425,16 @@ static int avi_read_idx1(AVFormatContext *s, int size)
// even if we have only a single stream, we should // even if we have only a single stream, we should
// switch to non-interleaved to get correct timestamps // switch to non-interleaved to get correct timestamps
if(last_pos == pos) if (last_pos == pos)
avi->non_interleaved= 1; avi->non_interleaved = 1;
if(last_idx != pos && len) { if (last_idx != pos && len) {
av_add_index_entry(st, pos, ast->cum_len, len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0); av_add_index_entry(st, pos, ast->cum_len, len, 0,
(flags & AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0);
last_idx= pos; last_idx= pos;
} }
ast->cum_len += get_duration(ast, len); ast->cum_len += get_duration(ast, len);
last_pos= pos; last_pos = pos;
anykey |= flags&AVIIF_INDEX; anykey |= flags&AVIIF_INDEX;
} }
if (!anykey) { if (!anykey) {
for (index = 0; index < s->nb_streams; index++) { for (index = 0; index < s->nb_streams; index++) {
...@@ -1358,34 +1446,35 @@ static int avi_read_idx1(AVFormatContext *s, int size) ...@@ -1358,34 +1446,35 @@ static int avi_read_idx1(AVFormatContext *s, int size)
return 0; return 0;
} }
static int guess_ni_flag(AVFormatContext *s){ static int guess_ni_flag(AVFormatContext *s)
{
int i; int i;
int64_t last_start=0; int64_t last_start = 0;
int64_t first_end= INT64_MAX; int64_t first_end = INT64_MAX;
int64_t oldpos= avio_tell(s->pb); int64_t oldpos = avio_tell(s->pb);
int *idx; int *idx;
int64_t min_pos, pos; int64_t min_pos, pos;
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
int n= st->nb_index_entries; int n = st->nb_index_entries;
unsigned int size; unsigned int size;
if(n <= 0) if (n <= 0)
continue; continue;
if(n >= 2){ if (n >= 2) {
int64_t pos= st->index_entries[0].pos; int64_t pos = st->index_entries[0].pos;
avio_seek(s->pb, pos + 4, SEEK_SET); avio_seek(s->pb, pos + 4, SEEK_SET);
size= avio_rl32(s->pb); size = avio_rl32(s->pb);
if(pos + size > st->index_entries[1].pos) if (pos + size > st->index_entries[1].pos)
last_start= INT64_MAX; last_start = INT64_MAX;
} }
if(st->index_entries[0].pos > last_start) if (st->index_entries[0].pos > last_start)
last_start= st->index_entries[0].pos; last_start = st->index_entries[0].pos;
if(st->index_entries[n-1].pos < first_end) if (st->index_entries[n - 1].pos < first_end)
first_end= st->index_entries[n-1].pos; first_end = st->index_entries[n - 1].pos;
} }
avio_seek(s->pb, oldpos, SEEK_SET); avio_seek(s->pb, oldpos, SEEK_SET);
if (last_start > first_end) if (last_start > first_end)
...@@ -1408,7 +1497,7 @@ static int guess_ni_flag(AVFormatContext *s){ ...@@ -1408,7 +1497,7 @@ static int guess_ni_flag(AVFormatContext *s){
if (idx[i]) if (idx[i])
max_dts = FFMAX(max_dts, av_rescale_q(st->index_entries[idx[i]-1].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q)); max_dts = FFMAX(max_dts, av_rescale_q(st->index_entries[idx[i]-1].timestamp/FFMAX(ast->sample_size, 1), st->time_base, AV_TIME_BASE_Q));
} }
if(max_dts - min_dts > 2*AV_TIME_BASE) { if (max_dts - min_dts > 2*AV_TIME_BASE) {
av_free(idx); av_free(idx);
return 1; return 1;
} }
...@@ -1422,15 +1511,15 @@ static int avi_load_index(AVFormatContext *s) ...@@ -1422,15 +1511,15 @@ static int avi_load_index(AVFormatContext *s)
AVIContext *avi = s->priv_data; AVIContext *avi = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
uint32_t tag, size; uint32_t tag, size;
int64_t pos= avio_tell(pb); int64_t pos = avio_tell(pb);
int64_t next; int64_t next;
int ret = -1; int ret = -1;
if (avio_seek(pb, avi->movi_end, SEEK_SET) < 0) if (avio_seek(pb, avi->movi_end, SEEK_SET) < 0)
goto the_end; // maybe truncated file goto the_end; // maybe truncated file
av_dlog(s, "movi_end=0x%"PRIx64"\n", avi->movi_end); av_dlog(s, "movi_end=0x%"PRIx64"\n", avi->movi_end);
for(;;) { for (;;) {
tag = avio_rl32(pb); tag = avio_rl32(pb);
size = avio_rl32(pb); size = avio_rl32(pb);
if (url_feof(pb)) if (url_feof(pb))
break; break;
...@@ -1447,18 +1536,19 @@ static int avi_load_index(AVFormatContext *s) ...@@ -1447,18 +1536,19 @@ static int avi_load_index(AVFormatContext *s)
avi_read_idx1(s, size) >= 0) { avi_read_idx1(s, size) >= 0) {
avi->index_loaded=2; avi->index_loaded=2;
ret = 0; ret = 0;
}else if(tag == MKTAG('L', 'I', 'S', 'T')) { }else if (tag == MKTAG('L', 'I', 'S', 'T')) {
uint32_t tag1 = avio_rl32(pb); uint32_t tag1 = avio_rl32(pb);
if (tag1 == MKTAG('I', 'N', 'F', 'O')) if (tag1 == MKTAG('I', 'N', 'F', 'O'))
ff_read_riff_info(s, size - 4); ff_read_riff_info(s, size - 4);
}else if(!ret) }else if (!ret)
break; break;
if (avio_seek(pb, next, SEEK_SET) < 0) if (avio_seek(pb, next, SEEK_SET) < 0)
break; // something is wrong here break; // something is wrong here
} }
the_end:
the_end:
avio_seek(pb, pos, SEEK_SET); avio_seek(pb, pos, SEEK_SET);
return ret; return ret;
} }
...@@ -1466,14 +1556,15 @@ static int avi_load_index(AVFormatContext *s) ...@@ -1466,14 +1556,15 @@ static int avi_load_index(AVFormatContext *s)
static void seek_subtitle(AVStream *st, AVStream *st2, int64_t timestamp) static void seek_subtitle(AVStream *st, AVStream *st2, int64_t timestamp)
{ {
AVIStream *ast2 = st2->priv_data; AVIStream *ast2 = st2->priv_data;
int64_t ts2 = av_rescale_q(timestamp, st->time_base, st2->time_base); int64_t ts2 = av_rescale_q(timestamp, st->time_base, st2->time_base);
av_free_packet(&ast2->sub_pkt); av_free_packet(&ast2->sub_pkt);
if (avformat_seek_file(ast2->sub_ctx, 0, INT64_MIN, ts2, ts2, 0) >= 0 || if (avformat_seek_file(ast2->sub_ctx, 0, INT64_MIN, ts2, ts2, 0) >= 0 ||
avformat_seek_file(ast2->sub_ctx, 0, ts2, ts2, INT64_MAX, 0) >= 0) avformat_seek_file(ast2->sub_ctx, 0, ts2, ts2, INT64_MAX, 0) >= 0)
ff_read_packet(ast2->sub_ctx, &ast2->sub_pkt); ff_read_packet(ast2->sub_ctx, &ast2->sub_pkt);
} }
static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) static int avi_read_seek(AVFormatContext *s, int stream_index,
int64_t timestamp, int flags)
{ {
AVIContext *avi = s->priv_data; AVIContext *avi = s->priv_data;
AVStream *st; AVStream *st;
...@@ -1486,12 +1577,14 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp ...@@ -1486,12 +1577,14 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
avi_load_index(s); avi_load_index(s);
avi->index_loaded |= 1; avi->index_loaded |= 1;
} }
av_assert0(stream_index>= 0); av_assert0(stream_index >= 0);
st = s->streams[stream_index]; st = s->streams[stream_index];
ast= st->priv_data; ast = st->priv_data;
index= av_index_search_timestamp(st, timestamp * FFMAX(ast->sample_size, 1), flags); index = av_index_search_timestamp(st,
if (index<0) { timestamp * FFMAX(ast->sample_size, 1),
flags);
if (index < 0) {
if (st->nb_index_entries > 0) if (st->nb_index_entries > 0)
av_log(s, AV_LOG_DEBUG, "Failed to find timestamp %"PRId64 " in index %"PRId64 " .. %"PRId64 "\n", av_log(s, AV_LOG_DEBUG, "Failed to find timestamp %"PRId64 " in index %"PRId64 " .. %"PRId64 "\n",
timestamp * FFMAX(ast->sample_size, 1), timestamp * FFMAX(ast->sample_size, 1),
...@@ -1501,7 +1594,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp ...@@ -1501,7 +1594,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
} }
/* find the position */ /* find the position */
pos = st->index_entries[index].pos; pos = st->index_entries[index].pos;
timestamp = st->index_entries[index].timestamp / FFMAX(ast->sample_size, 1); timestamp = st->index_entries[index].timestamp / FFMAX(ast->sample_size, 1);
av_dlog(s, "XX %"PRId64" %d %"PRId64"\n", av_dlog(s, "XX %"PRId64" %d %"PRId64"\n",
...@@ -1513,24 +1606,24 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp ...@@ -1513,24 +1606,24 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
/* the av_index_search_timestamp call above. */ /* the av_index_search_timestamp call above. */
av_assert0(stream_index == 0); av_assert0(stream_index == 0);
if(avio_seek(s->pb, pos, SEEK_SET) < 0) if (avio_seek(s->pb, pos, SEEK_SET) < 0)
return -1; return -1;
/* Feed the DV video stream version of the timestamp to the */ /* Feed the DV video stream version of the timestamp to the */
/* DV demux so it can synthesize correct timestamps. */ /* DV demux so it can synthesize correct timestamps. */
ff_dv_offset_reset(avi->dv_demux, timestamp); ff_dv_offset_reset(avi->dv_demux, timestamp);
avi->stream_index= -1; avi->stream_index = -1;
return 0; return 0;
} }
pos_min= pos; pos_min = pos;
for(i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st2 = s->streams[i]; AVStream *st2 = s->streams[i];
AVIStream *ast2 = st2->priv_data; AVIStream *ast2 = st2->priv_data;
ast2->packet_size= ast2->packet_size =
ast2->remaining= 0; ast2->remaining = 0;
if (ast2->sub_ctx) { if (ast2->sub_ctx) {
seek_subtitle(st, st2, timestamp); seek_subtitle(st, st2, timestamp);
...@@ -1541,17 +1634,22 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp ...@@ -1541,17 +1634,22 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
continue; continue;
// av_assert1(st2->codec->block_align); // av_assert1(st2->codec->block_align);
av_assert0((int64_t)st2->time_base.num*ast2->rate == (int64_t)st2->time_base.den*ast2->scale); av_assert0((int64_t)st2->time_base.num * ast2->rate ==
index = av_index_search_timestamp( (int64_t)st2->time_base.den * ast2->scale);
st2, index = av_index_search_timestamp(st2,
av_rescale_q(timestamp, st->time_base, st2->time_base) * FFMAX(ast2->sample_size, 1), av_rescale_q(timestamp,
flags | AVSEEK_FLAG_BACKWARD | (st2->codec->codec_type != AVMEDIA_TYPE_VIDEO ? AVSEEK_FLAG_ANY : 0)); st->time_base,
if(index<0) st2->time_base) *
index=0; FFMAX(ast2->sample_size, 1),
ast2->seek_pos= st2->index_entries[index].pos; flags |
pos_min= FFMIN(pos_min,ast2->seek_pos); AVSEEK_FLAG_BACKWARD |
(st2->codec->codec_type != AVMEDIA_TYPE_VIDEO ? AVSEEK_FLAG_ANY : 0));
if (index < 0)
index = 0;
ast2->seek_pos = st2->index_entries[index].pos;
pos_min = FFMIN(pos_min,ast2->seek_pos);
} }
for(i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st2 = s->streams[i]; AVStream *st2 = s->streams[i];
AVIStream *ast2 = st2->priv_data; AVIStream *ast2 = st2->priv_data;
...@@ -1562,9 +1660,9 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp ...@@ -1562,9 +1660,9 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
st2, st2,
av_rescale_q(timestamp, st->time_base, st2->time_base) * FFMAX(ast2->sample_size, 1), av_rescale_q(timestamp, st->time_base, st2->time_base) * FFMAX(ast2->sample_size, 1),
flags | AVSEEK_FLAG_BACKWARD | (st2->codec->codec_type != AVMEDIA_TYPE_VIDEO ? AVSEEK_FLAG_ANY : 0)); flags | AVSEEK_FLAG_BACKWARD | (st2->codec->codec_type != AVMEDIA_TYPE_VIDEO ? AVSEEK_FLAG_ANY : 0));
if(index<0) if (index < 0)
index=0; index = 0;
while(!avi->non_interleaved && index>0 && st2->index_entries[index-1].pos >= pos_min) while (!avi->non_interleaved && index>0 && st2->index_entries[index-1].pos >= pos_min)
index--; index--;
ast2->frame_offset = st2->index_entries[index].timestamp; ast2->frame_offset = st2->index_entries[index].timestamp;
} }
...@@ -1574,8 +1672,8 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp ...@@ -1574,8 +1672,8 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
av_log(s, AV_LOG_ERROR, "Seek failed\n"); av_log(s, AV_LOG_ERROR, "Seek failed\n");
return -1; return -1;
} }
avi->stream_index= -1; avi->stream_index = -1;
avi->dts_max= INT_MIN; avi->dts_max = INT_MIN;
return 0; return 0;
} }
...@@ -1584,8 +1682,8 @@ static int avi_read_close(AVFormatContext *s) ...@@ -1584,8 +1682,8 @@ static int avi_read_close(AVFormatContext *s)
int i; int i;
AVIContext *avi = s->priv_data; AVIContext *avi = s->priv_data;
for(i=0;i<s->nb_streams;i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
AVIStream *ast = st->priv_data; AVIStream *ast = st->priv_data;
if (ast) { if (ast) {
if (ast->sub_ctx) { if (ast->sub_ctx) {
...@@ -1607,9 +1705,9 @@ static int avi_probe(AVProbeData *p) ...@@ -1607,9 +1705,9 @@ static int avi_probe(AVProbeData *p)
int i; int i;
/* check file header */ /* check file header */
for(i=0; avi_headers[i][0]; i++) for (i = 0; avi_headers[i][0]; i++)
if(!memcmp(p->buf , avi_headers[i] , 4) && if (!memcmp(p->buf, avi_headers[i], 4) &&
!memcmp(p->buf+8, avi_headers[i]+4, 4)) !memcmp(p->buf + 8, avi_headers[i] + 4, 4))
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment