commit 9c8decb59732cff4512cb90d314bae2982909e12
author Debargha Mukherjee <debargha@google.com> Fri Dec 01 15:14:40 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Sat Dec 02 02:42:46 2017 +0000
tree 25bf35e045417ab5af7993a4d4bde864f0f8f251
parent d300f0e4dee8d317852c0a4c77b58e59614a6c30

Rd fix for returning skip correctly

Change-Id: I7f108fce272b5bf416836d99430f07af801daada

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 2806f80..6573e0d 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4173,8 +4173,12 @@
       }
     }
   }
-  this_rd = AOMMIN(RDCOST(x->rdmult, rd_stats->rate, rd_stats->dist),
-                   RDCOST(x->rdmult, rd_stats->zero_rate, rd_stats->sse));
+  int64_t zero_rd = RDCOST(x->rdmult, rd_stats->zero_rate, rd_stats->sse);
+  this_rd = RDCOST(x->rdmult, rd_stats->rate, rd_stats->dist);
+  if (zero_rd < this_rd) {
+    this_rd = zero_rd;
+    rd_stats->skip = 1;
+  }
   if (this_rd > ref_best_rd) is_cost_valid = 0;
 
   if (!is_cost_valid) {