From: Yaowu Xu <yaowu@google.com>
Date: Tue, 2 Jul 2013 02:13:18 +0000 (-0700)
Subject: fix the mismatch again in cpu_used 2
X-Git-Tag: v1.3.0~970
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e408e35041f52e2608915493964d2cda6ae6969;p=libvpx

fix the mismatch again in cpu_used 2

Change-Id: Icc4f70f0b0f91c9e7d5d00eedd67841afe2f2679
---

diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index bb4bbd87c..51dc7911c 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -738,7 +738,9 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
                                           cpi->common.show_frame == 0);
       }
       if (speed == 2) {
-        sf->use_largest_txform        = 1;
+        sf->use_largest_txform        = !(cpi->common.frame_type == KEY_FRAME ||
+                                                  cpi->common.intra_only ||
+                                                  cpi->common.show_frame == 0);
         sf->adjust_thresholds_by_speed = 1;
         sf->less_rectangular_check  = 1;
         sf->comp_inter_joint_search_thresh = BLOCK_SIZE_TYPES;