commit 250bc3a61c501344523eec07fec35f304767260b
author Sachin Kumar Garg <sachin.kumargarg@ittiam.com> Wed Nov 28 20:13:01 2018 +0530
committer Yunqing Wang <yunqingwang@google.com> Thu Nov 29 18:59:23 2018 +0000
tree 0cec181c046a71080ac43f02ce0fc62ebe6051b6
parent 903118636d53abc27f987e8fcebe1707b435d2b6

Improve skip decision after final txfm search

For speed >= 4, skip decision is modified to account for
skip/non-skip cost in sf_refine_fast_tx_type_search().

BD-rate improved by 0.05% (as per AWCY runs) with encode
time reduction of 0.43% (averaged across multiple test
cases) for speed=4 preset.

STATS_CHANGED

Change-Id: I7958b59353d8a32dc428b5451fe5215f50ae704c

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 007c6a4..b393e6f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -10522,6 +10522,7 @@
         !is_inter_mode(best_mbmode->mode)))) {
     int skip_blk = 0;
     RD_STATS rd_stats_y, rd_stats_uv;
+    const int skip_ctx = av1_get_skip_context(xd);
 
     x->use_default_inter_tx_type = 0;
     x->use_default_intra_tx_type = 0;
@@ -10569,17 +10570,19 @@
       }
     }
 
-    if (RDCOST(x->rdmult, rd_stats_y.rate + rd_stats_uv.rate,
+    if (RDCOST(x->rdmult,
+               x->skip_cost[skip_ctx][0] + rd_stats_y.rate + rd_stats_uv.rate,
                (rd_stats_y.dist + rd_stats_uv.dist)) >
-        RDCOST(x->rdmult, 0, (rd_stats_y.sse + rd_stats_uv.sse))) {
+        RDCOST(x->rdmult, x->skip_cost[skip_ctx][1],
+               (rd_stats_y.sse + rd_stats_uv.sse))) {
       skip_blk = 1;
-      rd_stats_y.rate = x->skip_cost[av1_get_skip_context(xd)][1];
+      rd_stats_y.rate = x->skip_cost[skip_ctx][1];
       rd_stats_uv.rate = 0;
       rd_stats_y.dist = rd_stats_y.sse;
       rd_stats_uv.dist = rd_stats_uv.sse;
     } else {
       skip_blk = 0;
-      rd_stats_y.rate += x->skip_cost[av1_get_skip_context(xd)][0];
+      rd_stats_y.rate += x->skip_cost[skip_ctx][0];
     }
 
     if (RDCOST(x->rdmult, best_rate_y + best_rate_uv, rd_cost->dist) >