commit 2ee31b42baff88ec04de10e834bce91cac22fb5a
author Hui Su <huisu@google.com> Thu Mar 05 17:25:31 2020 +0000
committer Hui Su <huisu@google.com> Thu Mar 05 23:25:59 2020 +0000
tree 01ae77c884d5ae11028e792983a12b2acb9875ad
parent 8afb8548a5153dfa5cf6436fa17bc4bf716f6a77

Revert "Assign gld_stack frames to ALTREF2 when applicable"

This reverts commit e74f075c0551d27e2b60b6908b216d59262fde2d.

Reason for revert: <Causing regression for speed >= 2>

STATS_CHANGED

Change-Id: I1ea643082d270887f668cb63f3fc9275b49b83a2

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index b47194b..1631bab 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -1013,20 +1013,11 @@
   if (gld_stack_size) {
     remapped_ref_idx[GOLDEN_FRAME - LAST_FRAME] = gld_stack[0];
 
-    // If there are more frames in the golden stack, assign them to BWDREF,
-    // ALTREF2, or LAST3.
     if (gld_stack_size > 1) {
-      if (arf_stack_size <= 2) {
-        if (arf_stack_size <= 1) {
-          remapped_ref_idx[BWDREF_FRAME - LAST_FRAME] = gld_stack[1];
-          if (gld_stack_size > 2)
-            remapped_ref_idx[ALTREF2_FRAME - LAST_FRAME] = gld_stack[2];
-        } else {
-          remapped_ref_idx[ALTREF2_FRAME - LAST_FRAME] = gld_stack[1];
-        }
-      } else {
+      if (arf_stack_size <= 1)
+        remapped_ref_idx[BWDREF_FRAME - LAST_FRAME] = gld_stack[1];
+      else
         remapped_ref_idx[LAST3_FRAME - LAST_FRAME] = gld_stack[1];
-      }
     }
   }