commit 644e966d1a11bcdc54a476f295c732220ec0e61c
author Debargha Mukherjee <debargha@google.com> Sun Dec 10 15:36:28 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Mon Dec 11 02:59:42 2017 +0000
tree 74d99acd99f9d16b117467ad49b8492e0a684726
parent 16d1cacb48403faf8c16a717c9d8697fb2ddd2f6

Fix Rd cost for skip overrides

I had done only a partial fix before. But updating the costs seems to
make an even bigger improvement to the baseline.

BUG=aomedia:1094

Change-Id: Id427819507143c05b4dc3d4c05e6b2a66d17899f

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 3ad9e39..5206bc6 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4183,6 +4183,8 @@
   this_rd = RDCOST(x->rdmult, rd_stats->rate, rd_stats->dist);
   if (zero_rd < this_rd) {
     this_rd = zero_rd;
+    rd_stats->rate = rd_stats->zero_rate;
+    rd_stats->dist = rd_stats->sse;
     rd_stats->skip = 1;
   }
   if (this_rd > ref_best_rd) is_cost_valid = 0;
@@ -4452,6 +4454,8 @@
   this_rd = RDCOST(x->rdmult, rd_stats->rate, rd_stats->dist);
   if (zero_rd < this_rd) {
     this_rd = zero_rd;
+    rd_stats->rate = rd_stats->zero_rate;
+    rd_stats->dist = rd_stats->sse;
     rd_stats->skip = 1;
   }
   if (this_rd > ref_best_rd) is_cost_valid = 0;