commit 6e1cd787b4282ecd8b6fd0098161ad7a5af7d319
author Luc Trudeau <luc@trud.ca> Wed Jun 21 13:52:36 2017 -0400
committer Luc Trudeau <luc@trud.ca> Fri Jul 28 19:19:25 2017 +0000
tree 67ec7b89d1af20128a60c9b58106059bff1ad669
parent 1a7f0a8cf4ecedfdf7d6d5b1930c8bf1510d6cd0

[CFL] New UV_PREDICTION_MODE for CFL

CfL is now an independent mode.

Results on Subset1 (Compared to 4266a7ed with CFL enabled)

   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.1645 | -0.4017 |  0.2475 |  -0.1851 | -0.2179 | -0.2338 |    -0.2897

Change-Id: I2e86e7ea7bfc12bb1d763e70a136ca992d57a3c5

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index da3b6e2..4c59d9d 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -73,10 +73,16 @@
   for (i = 0; i < BLOCK_SIZE_GROUPS; ++i)
     av1_cost_tokens_from_cdf(cpi->mbmode_cost[i], fc->y_mode_cdf[i],
                              av1_intra_mode_inv);
-
+  const int *uv_mode_inv_map =
+#if CONFIG_CFL
+      // CfL codes the uv_mode without reordering it
+      NULL;
+#else
+      av1_intra_mode_inv;
+#endif
   for (i = 0; i < INTRA_MODES; ++i)
     av1_cost_tokens_from_cdf(cpi->intra_uv_mode_cost[i], fc->uv_mode_cdf[i],
-                             av1_intra_mode_inv);
+                             uv_mode_inv_map);
 
   for (i = 0; i < SWITCHABLE_FILTER_CONTEXTS; ++i)
     av1_cost_tokens(cpi->switchable_interp_costs[i],