commit 41726041ea53b3f31dbbb9d6dc1c57c8ef704f84
author Ravi Chaudhary <ravi.chaudhary@ittiam.com> Mon Jul 23 15:51:28 2018 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Jul 24 02:05:02 2018 +0000
tree 8595abe291edaf028c929f639bbc9b5432879916
parent 8f26da4adfe8eec2a35be867f1e51f52e6e71bcc

Fix encoder multi-threading mismatch for superres

AV1 encoder multi-threading mismatch for superres=2 case
hs been fixed.

BUG=aomedia:2035

Change-Id: I904f8681f335e37e1f14bc22a03dd0dafe568035

av1/encoder/picklpf.c

diff --git a/av1/encoder/picklpf.c b/av1/encoder/picklpf.c
index 461c3af..504baff 100644
--- a/av1/encoder/picklpf.c
+++ b/av1/encoder/picklpf.c
@@ -193,6 +193,7 @@
   (void)sd;
 
   lf->sharpness_level = 0;
+  cpi->td.mb.rdmult = cpi->rd.RDMULT;
 
   if (method == LPF_PICK_MINIMAL_LPF) {
     lf->filter_level[0] = 0;

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index 28b693b..d1ac8de 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -1266,6 +1266,7 @@
   // problem, as these elements are ignored later, but in order to quiet
   // Valgrind's warnings we initialise the array below.
   memset(rusi, 0, sizeof(*rusi) * ntiles[0]);
+  cpi->td.mb.rdmult = cpi->rd.RDMULT;
 
   RestSearchCtxt rsc;
   const int plane_start = AOM_PLANE_Y;