commit 35b3bd3e3b0903b217780a15bf83cdabce58d804
author Jingning Han <jingning@google.com> Tue Nov 10 16:02:33 2015 -0800
committer Jingning Han <jingning@google.com> Tue Nov 10 16:04:00 2015 -0800
tree e37c4a2f6018854906007b7812ddedf034aff899
parent dcbe42298ac55537c4c162b1bb43a22e2c9e4976

Fix an encoding failure case when speed features are on

This commit fixes an encoding failure case triggered when early
termination feature is turned on for transform block size search.
It resolves the corresponding enc/dec mismatch issue.

Change-Id: I2c5b7d8b1efe25fe3810e6ed307f4b1865dede49

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index adcd547..dc56563 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -912,9 +912,9 @@
       if (cpi->sf.tx_size_search_breakout &&
           (rd == INT64_MAX ||
 #if CONFIG_EXT_TX
-           (s == 1 && tx_type != DCT_DCT) ||
+           (s == 1 && tx_type != DCT_DCT && n < start_tx) ||
 #else
-           (s == 1) ||
+           (s == 1 && n < start_tx) ||
 #endif
            (n < (int) max_tx_size && rd > last_rd)))
         break;