commit 1c8ccb415be401d32811bbb067f68b7cb05d8dc4
author Hui Su <huisu@google.com> Thu Dec 05 16:38:56 2019 -0800
committer Hui Su <huisu@google.com> Fri Dec 06 19:29:01 2019 +0000
tree 5f6747c815a021667807e69256236fae7ec8b7f6
parent 94b672c411e36b942424a4655c35d4b6427ea7fe

Use correct block size in choose_intra_uv_mode()

The block size should not be upscaled, otherwise rate calculation
may be incorrect.

Coding performance is neutral on lowres, midres and hdres.

STATS_CHANGED

Change-Id: Ie85dce12fbab3716f0dbfbf0d0f325699b50b067

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 4f40834..2896db4 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7061,8 +7061,6 @@
   xd->cfl.is_chroma_reference =
       is_chroma_reference(mi_row, mi_col, bsize, cm->seq_params.subsampling_x,
                           cm->seq_params.subsampling_y);
-  bsize = scale_chroma_bsize(bsize, xd->plane[AOM_PLANE_U].subsampling_x,
-                             xd->plane[AOM_PLANE_U].subsampling_y);
   // Only store reconstructed luma when there's chroma RDO. When there's no
   // chroma RDO, the reconstructed luma will be stored in encode_superblock().
   xd->cfl.store_y = store_cfl_required_rdo(cm, x);