commit 2d2dac2b5f2e02704bd4729e8ba7fda71722c8c0
author Jingning Han <jingning@google.com> Tue Apr 11 09:41:10 2017 -0700
committer Jingning Han <jingning@google.com> Tue Apr 11 17:52:11 2017 +0000
tree a593f22058d936b24c8a0b335f33dfe0939bd137
parent 6520156927be49764134755e8960ff0adf7d5e09

Fix YUV444 lossless mode unit test

Properly scale the chroma component size per color plane.

Change-Id: Ibf192d0e99f2fc3611beb82a3a9951ad09b292d3

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index c00c3d2..cbed979 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3754,7 +3754,9 @@
 
 #if CONFIG_CB4X4 && !CONFIG_CHROMA_2X2
   if (x->skip_chroma_rd) return is_cost_valid;
-  bsize = AOMMAX(BLOCK_8X8, bsize);
+
+  bsize = scale_chroma_bsize(bsize, xd->plane[1].subsampling_x,
+                             xd->plane[1].subsampling_y);
 #endif  // CONFIG_CB4X4 && !CONFIG_CHROMA_2X2
 
 #if !CONFIG_PVQ