Fix conflict between lv_map and cb4x4

Change-Id: I0512000554ef74d397332e5ed135fe20e2c4a37e

Fix conflict between lv_map and cb4x4
Change-Id: I0512000554ef74d397332e5ed135fe20e2c4a37e
ee4a34c2 · Angie Chiang · d61e608d · ee4a34c2
Commit ee4a34c2 authored Jun 07, 2017 by Angie Chiang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

av1/encoder/encodetxb.c av1/encoder/encodetxb.c +5 -0

No files found.
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -184,7 +184,12 @@ void av1_write_coeffs_mb(const AV1_COMMON *const cm, MACROBLOCK *x,
  struct macroblockd_plane *pd = &xd->plane[plane];

 #if CONFIG_CB4X4
+#if CONFIG_CHROMA_2X2
  const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
+#else
+  const BLOCK_SIZE plane_bsize =
+      AOMMAX(BLOCK_4X4, get_plane_block_size(bsize, pd));
+#endif  // CONFIG_CHROMA_2X2
 #else
  const BLOCK_SIZE plane_bsize =
      get_plane_block_size(AOMMAX(bsize, BLOCK_8X8), pd);