From: Jerome Jiang <jianj@google.com>
Date: Fri, 10 May 2019 04:04:11 +0000 (-0700)
Subject: Fix tsan failure in webrtc test.
X-Git-Tag: v1.8.1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e742d5ac09e2324540be964aa04d1af28e5ce504;p=libvpx

Fix tsan failure in webrtc test.

plane block size is used when computing model rd for uv.
However, it iterates thru sub-blocks based on tx size on uv planes
and plane block size could be bigger than that, which leads to reading
beyond tile boundary when the block is on it.

BUG=b/131414589

Change-Id: I362091484b1325b89d2175039323b235a06ebffc
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index a431e4ca6..b9073b358 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1029,7 +1029,7 @@ static void estimate_block_intra(int plane, int block, int row, int col,
   } else {
     unsigned int var = 0;
     unsigned int sse = 0;
-    model_rd_for_sb_uv(cpi, plane_bsize, x, xd, &this_rdc, &var, &sse, plane,
+    model_rd_for_sb_uv(cpi, bsize_tx, x, xd, &this_rdc, &var, &sse, plane,
                        plane);
   }