From c4765a41b956f15b855746a8fe91309e087431f4 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 19 Feb 2016 01:31:16 +0100
Subject: [PATCH] avcodec/h264: Execute error concealment before marking the
frame as done.
Fixes race condition causing artifacts
Fixes Ticket4122
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 98a0053d0f90e3309dc1038b1bae3a48bbd9067c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/h264.c | 41 +++++++++++++++++++++++++++++++++++++++
libavcodec/h264_picture.c | 41 ---------------------------------------
2 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index fe8d44e3bd..f1399b886a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1678,6 +1678,47 @@ again:
ret = 0;
end:
+
+#if CONFIG_ERROR_RESILIENCE
+ sl = h->slice_ctx;
+ /*
+ * FIXME: Error handling code does not seem to support interlaced
+ * when slices span multiple rows
+ * The ff_er_add_slice calls don't work right for bottom
+ * fields; they cause massive erroneous error concealing
+ * Error marking covers both fields (top and bottom).
+ * This causes a mismatched s->error_count
+ * and a bad error table. Further, the error count goes to
+ * INT_MAX when called for bottom field, because mb_y is
+ * past end by one (callers fault) and resync_mb_y != 0
+ * causes problems for the first MB line, too.
+ */
+ if (!FIELD_PICTURE(h) && h->current_slice && !h->sps.new && h->enable_er) {
+ int use_last_pic = h->last_pic_for_ec.f->buf[0] && !sl->ref_count[0];
+
+ ff_h264_set_erpic(&sl->er.cur_pic, h->cur_pic_ptr);
+
+ if (use_last_pic) {
+ ff_h264_set_erpic(&sl->er.last_pic, &h->last_pic_for_ec);
+ sl->ref_list[0][0].parent = &h->last_pic_for_ec;
+ memcpy(sl->ref_list[0][0].data, h->last_pic_for_ec.f->data, sizeof(sl->ref_list[0][0].data));
+ memcpy(sl->ref_list[0][0].linesize, h->last_pic_for_ec.f->linesize, sizeof(sl->ref_list[0][0].linesize));
+ sl->ref_list[0][0].reference = h->last_pic_for_ec.reference;
+ } else if (sl->ref_count[0]) {
+ ff_h264_set_erpic(&sl->er.last_pic, sl->ref_list[0][0].parent);
+ } else
+ ff_h264_set_erpic(&sl->er.last_pic, NULL);
+
+ if (sl->ref_count[1])
+ ff_h264_set_erpic(&sl->er.next_pic, sl->ref_list[1][0].parent);
+
+ sl->er.ref_count = sl->ref_count[0];
+
+ ff_er_frame_end(&sl->er);
+ if (use_last_pic)
+ memset(&sl->ref_list[0][0], 0, sizeof(sl->ref_list[0][0]));
+ }
+#endif /* CONFIG_ERROR_RESILIENCE */
/* clean up */
if (h->cur_pic_ptr && !h->droppable) {
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX,
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index 731d780e67..c4b17c03c9 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -186,47 +186,6 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup)
ff_vdpau_h264_picture_complete(h);
#endif
-#if CONFIG_ERROR_RESILIENCE
- av_assert0(sl == h->slice_ctx);
- /*
- * FIXME: Error handling code does not seem to support interlaced
- * when slices span multiple rows
- * The ff_er_add_slice calls don't work right for bottom
- * fields; they cause massive erroneous error concealing
- * Error marking covers both fields (top and bottom).
- * This causes a mismatched s->error_count
- * and a bad error table. Further, the error count goes to
- * INT_MAX when called for bottom field, because mb_y is
- * past end by one (callers fault) and resync_mb_y != 0
- * causes problems for the first MB line, too.
- */
- if (!FIELD_PICTURE(h) && h->current_slice && !h->sps.new && h->enable_er) {
- int use_last_pic = h->last_pic_for_ec.f->buf[0] && !sl->ref_count[0];
-
- ff_h264_set_erpic(&sl->er.cur_pic, h->cur_pic_ptr);
-
- if (use_last_pic) {
- ff_h264_set_erpic(&sl->er.last_pic, &h->last_pic_for_ec);
- sl->ref_list[0][0].parent = &h->last_pic_for_ec;
- memcpy(sl->ref_list[0][0].data, h->last_pic_for_ec.f->data, sizeof(sl->ref_list[0][0].data));
- memcpy(sl->ref_list[0][0].linesize, h->last_pic_for_ec.f->linesize, sizeof(sl->ref_list[0][0].linesize));
- sl->ref_list[0][0].reference = h->last_pic_for_ec.reference;
- } else if (sl->ref_count[0]) {
- ff_h264_set_erpic(&sl->er.last_pic, sl->ref_list[0][0].parent);
- } else
- ff_h264_set_erpic(&sl->er.last_pic, NULL);
-
- if (sl->ref_count[1])
- ff_h264_set_erpic(&sl->er.next_pic, sl->ref_list[1][0].parent);
-
- sl->er.ref_count = sl->ref_count[0];
-
- ff_er_frame_end(&sl->er);
- if (use_last_pic)
- memset(&sl->ref_list[0][0], 0, sizeof(sl->ref_list[0][0]));
- }
-#endif /* CONFIG_ERROR_RESILIENCE */
-
if (!in_setup && !h->droppable)
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX,
h->picture_structure == PICT_BOTTOM_FIELD);