virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

error resilience: check error_concealment, not err_recognition.

Browse Source 
err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.
This commit is contained in:
Anton Khirnov 2013-10-25 07:19:27 +02:00
parent 53151723e3
commit f354f30836
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/error_resilience.c
View File

@ -726,7 +726,7 @@ static int is_intra_more_likely(ERContext *s)
void ff_er_frame_start(ERContext *s) void ff_er_frame_start(ERContext *s)
{ {
if (!s->avctx->err_recognition) if (!s->avctx->error_concealment)
return; return;
memset(s->error_status_table, ER_MB_ERROR | VP_START | ER_MB_END, memset(s->error_status_table, ER_MB_ERROR | VP_START | ER_MB_END,
@ -760,7 +760,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty,
return; return;
} }
if (!s->avctx->err_recognition) if (!s->avctx->error_concealment)
return; return;
mask &= ~VP_START; mask &= ~VP_START;
@ -822,7 +822,7 @@ void ff_er_frame_end(ERContext *s)
/* We do not support ER of field pictures yet, /* We do not support ER of field pictures yet,
* though it should not crash if enabled. */ * though it should not crash if enabled. */
if (!s->avctx->err_recognition || s->error_count == 0 || if (!s->avctx->error_concealment || s->error_count == 0 ||
s->avctx->hwaccel || s->avctx->hwaccel ||
!s->cur_pic || s->cur_pic->field_picture || !s->cur_pic || s->cur_pic->field_picture ||
s->error_count == 3 * s->mb_width * s->error_count == 3 * s->mb_width *