commit baa656c6f9732da6263cee27ce026197f5a59a45
author Satish Kumar Suman <satish.suman@ittiam.com> Tue Aug 06 07:19:04 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Aug 06 15:55:26 2019 +0000
tree ecb0c168f15cea114e327c3fb2ae28354b47e7bc
parent 28ae676612abbf5b0d747082836c071e18183fc3

Resubmit "Fix issues with prune_compound_using_single_ref"

Ensured that ref_frame_rd is updated appropriately

STATS_CHANGED

BUG=aomedia:2449

Change-Id: Ib4798b8a6f0cfced5cbf03b2862e7a0d42163440

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index ed1e2e9..8af705f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -12770,6 +12770,14 @@
                                        INT64_MAX, INT64_MAX };
   const int skip_ctx = av1_get_skip_context(xd);
   for (int midx = 0; midx < MAX_MODES; ++midx) {
+    // After we done with single reference modes, find the 2nd best RD
+    // for a reference frame. Only search compound modes that have a reference
+    // frame at least as good as the 2nd best.
+    if (sf->prune_compound_using_single_ref &&
+        midx == MAX_SINGLE_REF_MODES + 1) {
+      find_top_ref(ref_frame_rd);
+    }
+
     if (inter_mode_compatible_skip(cpi, x, bsize, midx)) continue;
 
     const MODE_DEFINITION *mode_order = &av1_mode_order[midx];
@@ -12784,13 +12792,6 @@
     const MV_REFERENCE_FRAME second_ref_frame = mode_order->ref_frame[1];
     const int comp_pred = second_ref_frame > INTRA_FRAME;
 
-    // After we done with single reference modes, find the 2nd best RD
-    // for a reference frame. Only search compound modes that have a reference
-    // frame at least as good as the 2nd best.
-    if (sf->prune_compound_using_single_ref &&
-        midx == MAX_SINGLE_REF_MODES + 1) {
-      find_top_ref(ref_frame_rd);
-    }
     if (sf->prune_compound_using_single_ref && midx > MAX_SINGLE_REF_MODES &&
         comp_pred &&
         !in_single_ref_cutoff(ref_frame_rd, ref_frame, second_ref_frame)) {