Download-Tools/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-26 08:23:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix mpeg1/2 decoding if there are no 0 bytes after the bitstream

Browse Source 
print mpeg1/2 startcodes support

Originally committed as revision 1919 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-05-30 00:02:25 +00:00
parent 701b603d74
commit cf713bb862
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/avcodec.h
View File

@ -118,8 +118,11 @@ enum SampleFormat {
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 131072 #define AVCODEC_MAX_AUDIO_FRAME_SIZE 131072
/** /**
* Required number of zero bytes at the end of the input bitstream for decoding. * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
* to avoid overreading (and possibly segfaulting) * this is mainly needed because some optimized bitstream readers read
* 32 or 64 bit at once and could read over the end<br>
* Note, if the first 23 bits of the additional bytes are not 0 then damaged
* MPEG bitstreams could cause overread and segfault
*/ */
#define FF_INPUT_BUFFER_PADDING_SIZE 8 #define FF_INPUT_BUFFER_PADDING_SIZE 8

22
libavcodec/mpeg12.c
View File

@ -1934,6 +1934,17 @@ static int mpeg_decode_slice(AVCodecContext *avctx,
s->mb_x = 0; s->mb_x = 0;
s->mb_y++; s->mb_y++;
if(s->mb_y<<field_pic >= s->mb_height){
int left= s->gb.size_in_bits - get_bits_count(&s->gb);
if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)))
|| (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){
fprintf(stderr, "end missmatch left=%d\n", left);
return -1;
}else
goto eos;
}
} }
/* skip mb handling */ /* skip mb handling */
@ -1963,10 +1974,6 @@ static int mpeg_decode_slice(AVCodecContext *avctx,
} }
} }
} }
if(s->mb_y<<field_pic >= s->mb_height){
fprintf(stderr, "slice too long\n");
return -1;
}
} }
eos: // end of slice eos: // end of slice
*buf += get_bits_count(&s->gb)/8 - 1; *buf += get_bits_count(&s->gb)/8 - 1;
@ -2249,8 +2256,13 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index); return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
} }
/* prepare data for next start code */
input_size = buf_end - buf_ptr; input_size = buf_end - buf_ptr;
if(avctx->debug & FF_DEBUG_STARTCODE){
printf("%3X at %d left %d\n", start_code, buf_ptr-buf, input_size);
}
/* prepare data for next start code */
switch(start_code) { switch(start_code) {
case SEQ_START_CODE: case SEQ_START_CODE:
mpeg1_decode_sequence(avctx, buf_ptr, mpeg1_decode_sequence(avctx, buf_ptr,