eden-emu/FFmpeg
15
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-28 23:49:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

support skiping of mb rows during decoding

Browse source 
Originally committed as revision 3253 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-06-26 02:20:38 +00:00
parent 75293f05f9
commit 0dfd33c3f1
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libavcodec/error_resilience.c
View file

@ -652,7 +652,7 @@ void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int en
s->error_status_table[start_xy] |= VP_START;
if(start_xy > 0 && s->avctx->thread_count <= 1){
if(start_xy > 0 && s->avctx->thread_count <= 1 && s->avctx->skip_top*s->mb_width < start_i){
int prev_status= s->error_status_table[ s->mb_index2xy[start_i - 1] ];
prev_status &= ~ VP_START;
@ -667,9 +667,10 @@ void ff_er_frame_end(MpegEncContext *s){
int threshold= 50;
int is_intra_likely;
if(!s->error_resilience || s->error_count==0) return;
if(!s->error_resilience || s->error_count==0 ||
s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;
av_log(s->avctx, AV_LOG_INFO, "concealing errors\n");
av_log(s->avctx, AV_LOG_INFO, "concealing %d errors\n", s->error_count);
if(s->current_picture.motion_val[0] == NULL){
int size = s->b8_stride * 2 * s->mb_height;