commit cb3a8ef5c5bac46e6f9cdfe9884d435175b8f460
author David Michael Barr <b@rr-dav.id.au> Sat Jan 06 15:48:49 2018 +0900
committer David Michael Barr <b@rr-dav.id.au> Tue Jan 16 21:51:22 2018 +0000
tree a33ec38ff5c184f4aa52a461179c00ca093160ad
parent a855cefc408e8de97a88fe01d79e14e59eda3287

[CFL] separate uv_mode CDFs, split on is_cfl_allowed

This is to exclude coding CFL for block sizes where it is normatively
not allowed.

Reuse the alternate CDFs from the --disable-cfl path.

This yields some improvement on subset1:
   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.0113 | -0.2630 | -0.2138 |   0.0021 | -0.0110 | -0.0157 |    -0.0511

BUG=aomedia:1182

Change-Id: I1e5f23ef7f2debcf8edce788bfa63ec95db4a679

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 57b702a..7cb8d54 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -293,7 +293,11 @@
   int interintra_mode_cost[BLOCK_SIZE_GROUPS][INTERINTRA_MODES];
   int motion_mode_cost[BLOCK_SIZES_ALL][MOTION_MODES];
   int motion_mode_cost1[BLOCK_SIZES_ALL][2];
+#if CONFIG_CFL
+  int intra_uv_mode_cost[CFL_ALLOWED_TYPES][INTRA_MODES][UV_INTRA_MODES];
+#else
   int intra_uv_mode_cost[INTRA_MODES][UV_INTRA_MODES];
+#endif
   int y_mode_costs[INTRA_MODES][INTRA_MODES][INTRA_MODES];
 #if CONFIG_FILTER_INTRA
   int filter_intra_cost[TX_SIZES_ALL][2];