COMPOUND_SINGLEREF: replace deprecated tree coding.

Use multi-symbol CDF coding instead.

Change-Id: I8a69364c8672474021d2ea5933e344d493186967

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index ee5cce7..5fa0097 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -177,21 +177,6 @@
 }
 #endif
 
-#if CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF
-static void read_inter_singleref_comp_mode_probs(FRAME_CONTEXT *fc,
-                                                 aom_reader *r) {
-  int i, j;
-  if (aom_read(r, GROUP_DIFF_UPDATE_PROB, ACCT_STR)) {
-    for (j = 0; j < INTER_MODE_CONTEXTS; ++j) {
-      for (i = 0; i < INTER_SINGLEREF_COMP_MODES - 1; ++i) {
-        av1_diff_update_prob(r, &fc->inter_singleref_comp_mode_probs[j][i],
-                             ACCT_STR);
-      }
-    }
-  }
-}
-#endif  // CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF
-
 static REFERENCE_MODE read_frame_reference_mode(
     const AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
   if (is_compound_reference_allowed(cm)) {
@@ -4932,10 +4917,6 @@
 #endif
 
 #if CONFIG_EXT_INTER
-#if CONFIG_COMPOUND_SINGLEREF
-    read_inter_singleref_comp_mode_probs(fc, &r);
-#endif  // CONFIG_COMPOUND_SINGLEREF
-
 #if CONFIG_INTERINTRA
     if (cm->reference_mode != COMPOUND_REFERENCE &&
         cm->allow_interintra_compound) {

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