Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

support some totally broken ODML variant

Browse source 
Originally committed as revision 6091 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-08-25 20:50:18 +00:00
parent b89c8f589a
commit 965a63af2b
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libavformat/avidec.c
View file

@ -100,9 +100,12 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
AVIStream *ast; AVIStream *ast;
int i; int i;
int64_t last_pos= -1; int64_t last_pos= -1;
int64_t filesize= url_fsize(&s->pb);
// av_log(s, AV_LOG_ERROR, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%Ld\n", #ifdef DEBUG_SEEK
// longs_pre_entry,index_type, entries_in_use, chunk_id, base); av_log(s, AV_LOG_ERROR, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%16LX\n",
longs_pre_entry,index_type, entries_in_use, chunk_id, base);
#endif
if(stream_id > s->nb_streams || stream_id < 0) if(stream_id > s->nb_streams || stream_id < 0)
return -1; return -1;
@ -119,6 +122,14 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
if(index_type>1) if(index_type>1)
return -1; return -1;
if(filesize > 0 && base >= filesize){
av_log(s, AV_LOG_ERROR, "ODML index invalid\n");
if(base>>32 == (base & 0xFFFFFFFF) && (base & 0xFFFFFFFF) < filesize && filesize <= 0xFFFFFFFF)
base &= 0xFFFFFFFF;
else
return -1;
}
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= get_le32(pb) + base - 8; int64_t pos= get_le32(pb) + base - 8;
@ -126,7 +137,9 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
int key= len >= 0; int key= len >= 0;
len &= 0x7FFFFFFF; len &= 0x7FFFFFFF;
//av_log(s, AV_LOG_ERROR, "pos:%Ld, len:%X\n", pos, len); #ifdef DEBUG_SEEK
av_log(s, AV_LOG_ERROR, "pos:%Ld, len:%X\n", pos, len);
#endif
if(last_pos == pos || pos == base - 8) if(last_pos == pos || pos == base - 8)
avi->non_interleaved= 1; avi->non_interleaved= 1;
else else
@ -152,11 +165,13 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
url_fseek(pb, pos, SEEK_SET); url_fseek(pb, pos, SEEK_SET);
} }
} }
avi->index_loaded=1;
return 0; return 0;
} }
static void clean_index(AVFormatContext *s){ static void clean_index(AVFormatContext *s){
int i, j; int i;
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];
@ -443,7 +458,6 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
i= url_ftell(pb); i= url_ftell(pb);
if(!url_is_streamed(pb)){ if(!url_is_streamed(pb)){
read_braindead_odml_indx(s, 0); read_braindead_odml_indx(s, 0);
avi->index_loaded=1;
} }
url_fseek(pb, i+size, SEEK_SET); url_fseek(pb, i+size, SEEK_SET);
break; break;
@ -771,7 +785,7 @@ static int avi_read_idx1(AVFormatContext *s, int size)
ast = st->priv_data; ast = st->priv_data;
#if defined(DEBUG_SEEK) #if defined(DEBUG_SEEK)
av_log(NULL, AV_LOG_DEBUG, "%d cum_len=%d\n", len, ast->cum_len); av_log(NULL, AV_LOG_DEBUG, "%d cum_len=%Ld\n", len, ast->cum_len);
#endif #endif
if(last_pos == pos) if(last_pos == pos)
avi->non_interleaved= 1; avi->non_interleaved= 1;