ref: e742d5ac09e2324540be964aa04d1af28e5ce504
parent: 14cc2c4709c37b4fde40b1d978f6081e5d7f4f09
author: Jerome Jiang <jianj@google.com>
date: Thu May 9 17:04:11 EDT 2019
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
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1029,7 +1029,7 @@
} 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);
}