diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-06-26 02:20:38 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-06-26 02:20:38 +0000 |
| commit | 0dfd33c3f115b95e016e8d6f0ffc3513f3b22182 (patch) | |
| tree | b219844bc47a15d66ed088a835c380cd347daba2 /libavcodec/error_resilience.c | |
| parent | 75293f05f9b9b6252c9ab5f5470affcb62847eb0 (diff) | |
| download | ffmpeg-0dfd33c3f115b95e016e8d6f0ffc3513f3b22182.tar.gz | |
support skiping of mb rows during decoding
Originally committed as revision 3253 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index b7aeebddfc..c18d775bb6 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -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; |