]> granicus.if.org Git - libvpx/commitdiff
fix the mismatch again in cpu_used 2
authorYaowu Xu <yaowu@google.com>
Tue, 2 Jul 2013 02:13:18 +0000 (19:13 -0700)
committerYaowu Xu <yaowu@google.com>
Tue, 2 Jul 2013 02:13:18 +0000 (19:13 -0700)
Change-Id: Icc4f70f0b0f91c9e7d5d00eedd67841afe2f2679

vp9/encoder/vp9_onyx_if.c

index bb4bbd87c8ee30c7dd22c9971e0637fbae1a2668..51dc7911c342b4ed8565381272111e0cbce27db2 100644 (file)
@@ -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;