From 8d486ae1d06f728b04300511e791b053a55c447d Mon Sep 17 00:00:00 2001
From: Luc Trudeau <luc@trud.ca>
Date: Thu, 25 May 2017 13:39:38 -0400
Subject: [PATCH] Simplify Frame Context for cfl_read_intra

Change-Id: I9e0967662f2ed855813b968d5afd09f6d9fc1b62
---
 av1/decoder/decodemv.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 738fde2e4..81d3dcc1b 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1095,13 +1095,8 @@ static void read_intra_frame_mode_info(AV1_COMMON *const cm,
 #if CONFIG_CFL
     // TODO(ltrudeau) support PALETTE
     if (mbmi->uv_mode == DC_PRED) {
-      mbmi->cfl_alpha_idx = read_cfl_alphas(
-#if CONFIG_EC_ADAPT
-          xd->tile_ctx,
-#else
-          cm->fc,
-#endif  // CONFIG_EC_ADAPT
-          r, mbmi->skip, mbmi->cfl_alpha_signs);
+      mbmi->cfl_alpha_idx =
+          read_cfl_alphas(ec_ctx, r, mbmi->skip, mbmi->cfl_alpha_signs);
     }
 #endif  // CONFIG_CFL
 
-- 
GitLab