commit 6b3d1e343d519b637a1a5bcc8f826820330aa9ad
author Hui Su <huisu@google.com> Fri Jan 05 11:25:40 2018 -0800
committer Hui Su <huisu@google.com> Sat Jan 06 01:20:39 2018 +0000
tree 3e50b46e75a8981147eb0aa4514661a14ee79fc9
parent c16fbbc0f0e74c774147b672cc024e9402172010

Remove probability model for comp_ref_type

Change-Id: Ib4b83335ba9c61435f774136bc57638d8b88e963

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6cd32e2..d3e321f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5892,12 +5892,12 @@
       aom_prob bwdref_comp_p1 = av1_get_pred_prob_comp_bwdref_p1(cm, xd);
 
 #if CONFIG_EXT_COMP_REFS
-      aom_prob comp_ref_type_p = av1_get_comp_reference_type_prob(cm, xd);
+      const int comp_ref_type_ctx = av1_get_comp_reference_type_context(xd);
       unsigned int ref_bicomp_costs[TOTAL_REFS_PER_FRAME] = { 0 };
 
       ref_bicomp_costs[LAST_FRAME] = ref_bicomp_costs[LAST2_FRAME] =
           ref_bicomp_costs[LAST3_FRAME] = ref_bicomp_costs[GOLDEN_FRAME] =
-              base_cost + av1_cost_bit(comp_ref_type_p, 1);
+              base_cost + x->comp_ref_type_cost[comp_ref_type_ctx][1];
       ref_bicomp_costs[BWDREF_FRAME] = ref_bicomp_costs[ALTREF2_FRAME] = 0;
       ref_bicomp_costs[ALTREF_FRAME] = 0;
 
@@ -5932,19 +5932,18 @@
       aom_prob uni_comp_ref_p2 = av1_get_pred_prob_uni_comp_ref_p2(cm, xd);
 
       ref_costs_comp[LAST_FRAME][LAST2_FRAME] =
-          base_cost + av1_cost_bit(comp_ref_type_p, 0) +
+          base_cost + x->comp_ref_type_cost[comp_ref_type_ctx][0] +
           av1_cost_bit(uni_comp_ref_p, 0) + av1_cost_bit(uni_comp_ref_p1, 0);
       ref_costs_comp[LAST_FRAME][LAST3_FRAME] =
-          base_cost + av1_cost_bit(comp_ref_type_p, 0) +
+          base_cost + x->comp_ref_type_cost[comp_ref_type_ctx][0] +
           av1_cost_bit(uni_comp_ref_p, 0) + av1_cost_bit(uni_comp_ref_p1, 1) +
           av1_cost_bit(uni_comp_ref_p2, 0);
       ref_costs_comp[LAST_FRAME][GOLDEN_FRAME] =
-          base_cost + av1_cost_bit(comp_ref_type_p, 0) +
+          base_cost + x->comp_ref_type_cost[comp_ref_type_ctx][0] +
           av1_cost_bit(uni_comp_ref_p, 0) + av1_cost_bit(uni_comp_ref_p1, 1) +
           av1_cost_bit(uni_comp_ref_p2, 1);
-
       ref_costs_comp[BWDREF_FRAME][ALTREF_FRAME] =
-          base_cost + av1_cost_bit(comp_ref_type_p, 0) +
+          base_cost + x->comp_ref_type_cost[comp_ref_type_ctx][0] +
           av1_cost_bit(uni_comp_ref_p, 1);
 
 #else   // !CONFIG_EXT_COMP_REFS