commit 3558a8c0af710c0209449bcb0567b8be7fa847a2
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Mon Jan 15 09:55:33 2018 +0100
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Mon Jan 15 17:09:58 2018 +0000
tree 24a5ad5a4cd143f3efb3d71a953b5db80a7a3f6b
parent 2d4322ba158596736ac5886bb0e6851fd8df4ee1

Remove experimental flag of REF_ADAPT

This experiment has been adopted, we can simplify the code
by dropping the associated preprocessor conditionals.

Change-Id: Ia2100f102de6d9d5a67ba7178a20a50202839636

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9662820..d14000d 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5788,56 +5788,42 @@
     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
-    if (cm->reference_mode != COMPOUND_REFERENCE) {
-#endif  // !CONFIG_REF_ADAPT
-      ref_costs_single[LAST_FRAME] = ref_costs_single[LAST2_FRAME] =
-          ref_costs_single[LAST3_FRAME] = ref_costs_single[BWDREF_FRAME] =
-              ref_costs_single[ALTREF2_FRAME] = ref_costs_single[GOLDEN_FRAME] =
-                  ref_costs_single[ALTREF_FRAME] = base_cost;
-      const int ctx_p1 = av1_get_pred_context_single_ref_p1(xd);
-      const int ctx_p2 = av1_get_pred_context_single_ref_p2(xd);
-      const int ctx_p3 = av1_get_pred_context_single_ref_p3(xd);
-      const int ctx_p4 = av1_get_pred_context_single_ref_p4(xd);
-      const int ctx_p5 = av1_get_pred_context_single_ref_p5(xd);
-      const int ctx_p6 = av1_get_pred_context_single_ref_p6(xd);
+    ref_costs_single[LAST_FRAME] = ref_costs_single[LAST2_FRAME] =
+        ref_costs_single[LAST3_FRAME] = ref_costs_single[BWDREF_FRAME] =
+            ref_costs_single[ALTREF2_FRAME] = ref_costs_single[GOLDEN_FRAME] =
+                ref_costs_single[ALTREF_FRAME] = base_cost;
+    const int ctx_p1 = av1_get_pred_context_single_ref_p1(xd);
+    const int ctx_p2 = av1_get_pred_context_single_ref_p2(xd);
+    const int ctx_p3 = av1_get_pred_context_single_ref_p3(xd);
+    const int ctx_p4 = av1_get_pred_context_single_ref_p4(xd);
+    const int ctx_p5 = av1_get_pred_context_single_ref_p5(xd);
+    const int ctx_p6 = av1_get_pred_context_single_ref_p6(xd);
 
-      ref_costs_single[LAST_FRAME] += x->single_ref_cost[ctx_p1][0][0];
-      ref_costs_single[LAST2_FRAME] += x->single_ref_cost[ctx_p1][0][0];
-      ref_costs_single[LAST3_FRAME] += x->single_ref_cost[ctx_p1][0][0];
-      ref_costs_single[GOLDEN_FRAME] += x->single_ref_cost[ctx_p1][0][0];
-      ref_costs_single[BWDREF_FRAME] += x->single_ref_cost[ctx_p1][0][1];
-      ref_costs_single[ALTREF2_FRAME] += x->single_ref_cost[ctx_p1][0][1];
-      ref_costs_single[ALTREF_FRAME] += x->single_ref_cost[ctx_p1][0][1];
+    ref_costs_single[LAST_FRAME] += x->single_ref_cost[ctx_p1][0][0];
+    ref_costs_single[LAST2_FRAME] += x->single_ref_cost[ctx_p1][0][0];
+    ref_costs_single[LAST3_FRAME] += x->single_ref_cost[ctx_p1][0][0];
+    ref_costs_single[GOLDEN_FRAME] += x->single_ref_cost[ctx_p1][0][0];
+    ref_costs_single[BWDREF_FRAME] += x->single_ref_cost[ctx_p1][0][1];
+    ref_costs_single[ALTREF2_FRAME] += x->single_ref_cost[ctx_p1][0][1];
+    ref_costs_single[ALTREF_FRAME] += x->single_ref_cost[ctx_p1][0][1];
 
-      ref_costs_single[LAST_FRAME] += x->single_ref_cost[ctx_p3][2][0];
-      ref_costs_single[LAST2_FRAME] += x->single_ref_cost[ctx_p3][2][0];
-      ref_costs_single[LAST3_FRAME] += x->single_ref_cost[ctx_p3][2][1];
-      ref_costs_single[GOLDEN_FRAME] += x->single_ref_cost[ctx_p3][2][1];
+    ref_costs_single[LAST_FRAME] += x->single_ref_cost[ctx_p3][2][0];
+    ref_costs_single[LAST2_FRAME] += x->single_ref_cost[ctx_p3][2][0];
+    ref_costs_single[LAST3_FRAME] += x->single_ref_cost[ctx_p3][2][1];
+    ref_costs_single[GOLDEN_FRAME] += x->single_ref_cost[ctx_p3][2][1];
 
-      ref_costs_single[BWDREF_FRAME] += x->single_ref_cost[ctx_p2][1][0];
-      ref_costs_single[ALTREF2_FRAME] += x->single_ref_cost[ctx_p2][1][0];
-      ref_costs_single[ALTREF_FRAME] += x->single_ref_cost[ctx_p2][1][1];
+    ref_costs_single[BWDREF_FRAME] += x->single_ref_cost[ctx_p2][1][0];
+    ref_costs_single[ALTREF2_FRAME] += x->single_ref_cost[ctx_p2][1][0];
+    ref_costs_single[ALTREF_FRAME] += x->single_ref_cost[ctx_p2][1][1];
 
-      ref_costs_single[LAST_FRAME] += x->single_ref_cost[ctx_p4][3][0];
-      ref_costs_single[LAST2_FRAME] += x->single_ref_cost[ctx_p4][3][1];
+    ref_costs_single[LAST_FRAME] += x->single_ref_cost[ctx_p4][3][0];
+    ref_costs_single[LAST2_FRAME] += x->single_ref_cost[ctx_p4][3][1];
 
-      ref_costs_single[LAST3_FRAME] += x->single_ref_cost[ctx_p5][4][0];
-      ref_costs_single[GOLDEN_FRAME] += x->single_ref_cost[ctx_p5][4][1];
+    ref_costs_single[LAST3_FRAME] += x->single_ref_cost[ctx_p5][4][0];
+    ref_costs_single[GOLDEN_FRAME] += x->single_ref_cost[ctx_p5][4][1];
 
-      ref_costs_single[BWDREF_FRAME] += x->single_ref_cost[ctx_p6][5][0];
-      ref_costs_single[ALTREF2_FRAME] += x->single_ref_cost[ctx_p6][5][1];
-#if !CONFIG_REF_ADAPT
-    } else {
-      ref_costs_single[LAST_FRAME] = 512;
-      ref_costs_single[LAST2_FRAME] = 512;
-      ref_costs_single[LAST3_FRAME] = 512;
-      ref_costs_single[BWDREF_FRAME] = 512;
-      ref_costs_single[ALTREF2_FRAME] = 512;
-      ref_costs_single[GOLDEN_FRAME] = 512;
-      ref_costs_single[ALTREF_FRAME] = 512;
-    }
-#endif  // !CONFIG_REF_ADAPT
+    ref_costs_single[BWDREF_FRAME] += x->single_ref_cost[ctx_p6][5][0];
+    ref_costs_single[ALTREF2_FRAME] += x->single_ref_cost[ctx_p6][5][1];
 
     if (cm->reference_mode != SINGLE_REFERENCE) {
       const int bwdref_comp_ctx_p = av1_get_pred_context_comp_bwdref_p(cm, xd);
@@ -9439,12 +9425,7 @@
 
       mode_excluded = cm->reference_mode == SINGLE_REFERENCE;
     } else {
-#if CONFIG_REF_ADAPT
       if (ref_frame != INTRA_FRAME) mode_excluded = 0;
-#else
-      if (ref_frame != INTRA_FRAME)
-        mode_excluded = cm->reference_mode == COMPOUND_REFERENCE;
-#endif  // CONFIG_REF_ADAPT
     }
 
     if (ref_frame == INTRA_FRAME) {