commit e8dfbcf3485d00975406dc6220ce237ce6255056
author Luc Trudeau <luc@trud.ca> Fri May 12 09:57:50 2017 -0400
committer Luc Trudeau <luc@trud.ca> Fri May 12 15:47:13 2017 +0000
tree 5be0f1919d8954ebbbd30cd5c623d36a98e98c1c
parent 041201908b393dd643cf6c44dc00f66b53ed3daf

[CFL] Remove explicit dependency on EC_ADAPT

Change-Id: I3e3d458aec7e26abc366992ac20f9fa838fe35bb

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 3a09495..7b7b882 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1538,8 +1538,15 @@
 
   if (!is_inter_block(mbmi)) {
 #if CONFIG_CFL
-    av1_predict_intra_block_encoder_facade(x, plane, block, blk_col, blk_row,
-                                           tx_size, plane_bsize);
+
+#if CONFIG_EC_ADAPT
+    FRAME_CONTEXT *const ec_ctx = xd->tile_ctx;
+#else
+    FRAME_CONTEXT *const ec_ctx = cm->fc;
+#endif  // CONFIG_EC_ADAPT
+
+    av1_predict_intra_block_encoder_facade(x, ec_ctx, plane, block, blk_col,
+                                           blk_row, tx_size, plane_bsize);
 #else
     av1_predict_intra_block_facade(xd, plane, block, blk_col, blk_row, tx_size);
 #endif
@@ -2356,8 +2363,15 @@
 #if CONFIG_CFL
       const struct macroblockd_plane *const pd = &xd->plane[0];
       const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
-      av1_predict_intra_block_encoder_facade(x, 0, block, col, row, tx_size,
-                                             plane_bsize);
+
+#if CONFIG_EC_ADAPT
+      FRAME_CONTEXT *const ec_ctx = xd->tile_ctx;
+#else
+      FRAME_CONTEXT *const ec_ctx = cm->fc;
+#endif  // CONFIG_EC_ADAPT
+
+      av1_predict_intra_block_encoder_facade(x, ec_ctx, 0, block, col, row,
+                                             tx_size, plane_bsize);
 #else
       av1_predict_intra_block_facade(xd, 0, block, col, row, tx_size);
 #endif