From: hui su <huisu@google.com>
Date: Mon, 13 Jun 2016 17:52:19 +0000 (-0700)
Subject: Handle intra modes when tx type speed feature is enabled
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c3b3d3686966cb00e9cb4620d5645907fd88c21;p=libvpx

Handle intra modes when tx type speed feature is enabled

Change-Id: I9dc156214f3b3ded33ab30d558124b3151548161
---

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index e8ff02035..330ac0107 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -9505,9 +9505,11 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
       break;
   }
 
-  if (sf->tx_type_search.fast_inter_tx_type_search == 1 &&
-      xd->lossless[mbmi->segment_id] == 0 &&
-      best_mode_index >= 0) {
+  if (xd->lossless[mbmi->segment_id] == 0 && best_mode_index >= 0 &&
+      ((sf->tx_type_search.fast_inter_tx_type_search == 1 &&
+        is_inter_mode(best_mbmode.mode)) ||
+       (sf->tx_type_search.fast_intra_tx_type_search == 1 &&
+        !is_inter_mode(best_mbmode.mode)))) {
     int rate_y = 0, rate_uv = 0;
     int64_t dist_y = 0, dist_uv = 0;
     int skip_y = 0, skip_uv = 0, skip_blk = 0;