Force EC_MULTISYMBOL on when --enable-cfl.

The cfl experiment depends on ec_multisymbol. Change-Id: Ibbdf810b6c586f81fb8bcefa39696c7033970c47

Force EC_MULTISYMBOL on when --enable-cfl.
The cfl experiment depends on ec_multisymbol. Change-Id: Ibbdf810b6c586f81fb8bcefa39696c7033970c47
28791653 · Nathan E. Egge · Nathan Egge · 92400ab7 · 28791653 · 28791653
Commit 28791653 authored May 09, 2017 by Nathan E. Egge Committed by Nathan Egge May 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

av1/decoder/decodemv.c av1/decoder/decodemv.c +1 -1

configure configure +1 -0

No files found.
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1134,7 +1134,7 @@ static void read_intra_frame_mode_info(AV1_COMMON *const cm,
      mbmi->cfl_alpha_ind = read_cfl_alphas(
 #if CONFIG_EC_ADAPT
          xd->tile_ctx,
-#elif CONFIG_EC_MULTISYMBOL
+#else
          cm->fc,
 #endif  // CONFIG_EC_ADAPT
          r, mbmi->skip, mbmi->cfl_alpha_signs);

--- a/configure
+++ b/configure
@@ -518,6 +518,7 @@ post_process_cmdline() {

    # Fix up experiment dependencies
    enabled pvq && enable_feature ec_adapt
+    enabled cfl && enable_feature ec_multisymbol
    enabled ec_adapt && enable_feature ec_multisymbol
    enabled new_tokenset && enable_feature ec_multisymbol
    enabled new_multisymbol && enable_feature ec_multisymbol