commit da816a1572530609c793e9de3b2aa8ed387021e2
author Hui Su <huisu@google.com> Fri Aug 18 14:46:02 2017 -0700
committer Hui Su <huisu@google.com> Wed Aug 23 16:40:10 2017 +0000
tree c79d49131037b118e605d0aa093d2582962d8d52
parent 6499a75cf24f9d8c41cf67300803430fa3a76a45

Use more strict RD upper bound in RD search

No coding performance changes; small encoding speed increase.

Change-Id: Ie459ee0ac549d15c2d5c713f733e67f2191f6b7a

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index e805137..0cdefd3 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2739,6 +2739,7 @@
           (!is_inter && ext_tx_used_intra[ext_tx_set][tx_type])) {
         rd = txfm_yrd(cpi, x, &this_rd_stats, ref_best_rd, bs, tx_type,
                       rect_tx_size);
+        ref_best_rd = AOMMIN(rd, ref_best_rd);
         if (rd < best_rd) {
 #if CONFIG_TXK_SEL
           memcpy(best_txk_type, mbmi->txk_type, sizeof(best_txk_type[0]) * 256);
@@ -2845,6 +2846,7 @@
         break;
 
       last_rd = rd;
+      ref_best_rd = AOMMIN(rd, ref_best_rd);
       if (rd < best_rd) {
 #if CONFIG_TXK_SEL
         memcpy(best_txk_type, mbmi->txk_type, sizeof(best_txk_type[0]) * 256);
@@ -5274,7 +5276,7 @@
 
     rd = select_tx_size_fix_type(cpi, x, &this_rd_stats, bsize, ref_best_rd,
                                  tx_type, rd_stats_stack);
-
+    ref_best_rd = AOMMIN(rd, ref_best_rd);
     if (rd < best_rd) {
       best_rd = rd;
       *rd_stats = this_rd_stats;