Fix intra boundary condition for YUV444 in cb4x4

Unify the intra boundary condition in the cb4x4 mode for all the
YUV 420/422/444 formats.

Change-Id: I97f048d5d69cbe91b6b53ef2192b2d9418d2a845

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index d3f5454..45f3a20 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -2158,8 +2158,8 @@
   const int txwpx = tx_size_wide[tx_size];
   const int txhpx = tx_size_high[tx_size];
 #if CONFIG_CB4X4 && !CONFIG_CHROMA_2X2
-  const int xr_chr_offset = (plane && bsize < BLOCK_8X8) ? 2 : 0;
-  const int yd_chr_offset = (plane && bsize < BLOCK_8X8) ? 2 : 0;
+  const int xr_chr_offset = (pd->subsampling_x && bsize < BLOCK_8X8) ? 2 : 0;
+  const int yd_chr_offset = (pd->subsampling_y && bsize < BLOCK_8X8) ? 2 : 0;
 #else
   const int xr_chr_offset = 0;
   const int yd_chr_offset = 0;