commit 9d0c03d671efe7fc629a8b46c433f87b67464458
author Hui Su <huisu@google.com> Wed Dec 27 16:05:23 2017 -0800
committer Hui Su <huisu@google.com> Thu Jan 04 00:21:11 2018 +0000
tree 4a37ffa5bb11e71505b049abddb431ef0ee001d1
parent 5ef90cebfbf10a90ddfb6f9cae6e196c7631eada

Remove probablity model for the comp_inter flag

Change-Id: I7c7f193dea8e99be31d048b3fe2b198887a52822

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index a687ed9..cfd3a89 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5785,11 +5785,11 @@
     const AV1_COMMON *cm, const MACROBLOCKD *xd, const MACROBLOCK *x,
     int segment_id, unsigned int *ref_costs_single,
 #if CONFIG_EXT_COMP_REFS
-    unsigned int (*ref_costs_comp)[TOTAL_REFS_PER_FRAME],
+    unsigned int (*ref_costs_comp)[TOTAL_REFS_PER_FRAME]
 #else
-    unsigned int *ref_costs_comp,
+    unsigned int *ref_costs_comp
 #endif  // CONFIG_EXT_COMP_REFS
-    aom_prob *comp_mode_p) {
+    ) {
   int seg_ref_active =
       segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME);
   if (seg_ref_active) {
@@ -5803,19 +5803,9 @@
 #else
     memset(ref_costs_comp, 0, TOTAL_REFS_PER_FRAME * sizeof(*ref_costs_comp));
 #endif  // CONFIG_EXT_COMP_REFS
-
-    *comp_mode_p = 128;
   } else {
     int intra_inter_ctx = av1_get_intra_inter_context(xd);
-
-    if (cm->reference_mode == REFERENCE_MODE_SELECT) {
-      *comp_mode_p = av1_get_reference_mode_prob(cm, xd);
-    } else {
-      *comp_mode_p = 128;
-    }
-
     ref_costs_single[INTRA_FRAME] = x->intra_inter_cost[intra_inter_ctx][0];
-
     unsigned int base_cost = x->intra_inter_cost[intra_inter_ctx][1];
 
 #if !CONFIG_REF_ADAPT
@@ -8843,7 +8833,8 @@
 #else
   unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME];
 #endif  // CONFIG_EXT_COMP_REFS
-  aom_prob comp_mode_p;
+  int *comp_inter_cost =
+      x->comp_inter_cost[av1_get_reference_mode_context(cm, xd)];
   int64_t best_intra_rd = INT64_MAX;
   unsigned int best_pred_sse = UINT_MAX;
   PREDICTION_MODE best_intra_mode = DC_PRED;
@@ -8927,7 +8918,7 @@
   }
 
   estimate_ref_frame_costs(cm, xd, x, segment_id, ref_costs_single,
-                           ref_costs_comp, &comp_mode_p);
+                           ref_costs_comp);
 
   for (i = 0; i < REFERENCE_MODES; ++i) best_pred_rd[i] = INT64_MAX;
   for (i = 0; i < TX_SIZES_ALL; i++) rate_uv_intra[i] = INT_MAX;
@@ -9919,7 +9910,7 @@
       if (this_rd == INT64_MAX) continue;
 
       if (is_comp_ref_allowed(mbmi->sb_type))
-        compmode_cost = av1_cost_bit(comp_mode_p, comp_pred);
+        compmode_cost = comp_inter_cost[comp_pred];
 
       if (cm->reference_mode == REFERENCE_MODE_SELECT) rate2 += compmode_cost;
     }
@@ -10567,7 +10558,8 @@
 #else
   unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME];
 #endif  // CONFIG_EXT_COMP_REFS
-  aom_prob comp_mode_p;
+  int *comp_inter_cost =
+      x->comp_inter_cost[av1_get_reference_mode_context(cm, xd)];
   InterpFilter best_filter = SWITCHABLE;
   int64_t this_rd = INT64_MAX;
   int rate2 = 0;
@@ -10576,7 +10568,7 @@
   (void)mi_col;
 
   estimate_ref_frame_costs(cm, xd, x, segment_id, ref_costs_single,
-                           ref_costs_comp, &comp_mode_p);
+                           ref_costs_comp);
 
   for (i = 0; i < TOTAL_REFS_PER_FRAME; ++i) x->pred_sse[i] = INT_MAX;
   for (i = LAST_FRAME; i < TOTAL_REFS_PER_FRAME; ++i)
@@ -10657,7 +10649,7 @@
   rate2 += av1_get_switchable_rate(cm, x, xd);
 
   if (cm->reference_mode == REFERENCE_MODE_SELECT)
-    rate2 += av1_cost_bit(comp_mode_p, comp_pred);
+    rate2 += comp_inter_cost[comp_pred];
 
   // Estimate the reference frame signaling cost and add it
   // to the rolling cost variable.