[FFmpeg-cvslog] error resilience: check error_concealment, not err_recognition.
Anton Khirnov
git at videolan.org
Mon Oct 28 12:27:51 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Oct 25 07:19:27 2013 +0200| [f354f30836a3148275ce60d19bbc581310249ad2] | committer: Anton Khirnov
error resilience: check error_concealment, not err_recognition.
err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f354f30836a3148275ce60d19bbc581310249ad2
---
libavcodec/error_resilience.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index a07787a..1769d2b 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -726,7 +726,7 @@ static int is_intra_more_likely(ERContext *s)
void ff_er_frame_start(ERContext *s)
{
- if (!s->avctx->err_recognition)
+ if (!s->avctx->error_concealment)
return;
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;
}
- if (!s->avctx->err_recognition)
+ if (!s->avctx->error_concealment)
return;
mask &= ~VP_START;
@@ -822,7 +822,7 @@ void ff_er_frame_end(ERContext *s)
/* We do not support ER of field pictures yet,
* 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->cur_pic || s->cur_pic->field_picture ||
s->error_count == 3 * s->mb_width *
More information about the ffmpeg-cvslog
mailing list