commit b8b14a9b329e4ff4b722146ba2c37caf0b2e347d
author Thomas Davies <thdavies@cisco.com> Wed Jul 12 15:11:49 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Thu Jul 13 06:07:48 2017 +0000
tree b692eca7e24ab3e4298200bbf1c1db4e217edeea
parent aff92d58b1cfdc301ad225fda113f5392c7677cb

COMPOUND_SINGLEREF: replace deprecated tree coding.

Use multi-symbol CDF coding instead.

Change-Id: I8a69364c8672474021d2ea5933e344d493186967

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 2049cff..53de878 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -404,13 +404,12 @@
 }
 
 #if CONFIG_COMPOUND_SINGLEREF
-static PREDICTION_MODE read_inter_singleref_comp_mode(AV1_COMMON *cm,
-                                                      MACROBLOCKD *xd,
+static PREDICTION_MODE read_inter_singleref_comp_mode(MACROBLOCKD *xd,
                                                       aom_reader *r,
                                                       int16_t ctx) {
   const int mode =
-      aom_read_tree(r, av1_inter_singleref_comp_mode_tree,
-                    cm->fc->inter_singleref_comp_mode_probs[ctx], ACCT_STR);
+      aom_read_symbol(r, xd->tile_ctx->inter_singleref_comp_mode_cdf[ctx],
+                      INTER_SINGLEREF_COMP_MODES, ACCT_STR);
   FRAME_COUNTS *counts = xd->counts;
 
   if (counts) ++counts->inter_singleref_comp_mode[ctx][mode];
@@ -2284,7 +2283,7 @@
         mbmi->mode = read_inter_compound_mode(cm, xd, r, mode_ctx);
 #if CONFIG_COMPOUND_SINGLEREF
       else if (is_singleref_comp_mode)
-        mbmi->mode = read_inter_singleref_comp_mode(cm, xd, r, mode_ctx);
+        mbmi->mode = read_inter_singleref_comp_mode(xd, r, mode_ctx);
 #endif  // CONFIG_COMPOUND_SINGLEREF
       else
 #endif  // CONFIG_EXT_INTER