From: Yunqing Wang <yunqingwang@google.com>
Date: Mon, 3 Mar 2014 19:12:11 +0000 (-0800)
Subject: Reset search_method for non-rd pick mode
X-Git-Tag: v1.4.0~2175^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b2190b2bfdb45fbe08bc2e8eb8349ff80f79cea;p=libvpx

Reset search_method for non-rd pick mode

Reset FAST_HEX search_method, which was lost because of code merging.

Change-Id: Ic2b2cb9ec2f1751e96f7db0f9226310f605fcc83
---

diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index d7bac6f0b..f98554517 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -859,7 +859,7 @@ static void set_rt_speed_feature(VP9_COMMON *cm,
   if (speed >= 7) {
     sf->partition_search_type = VAR_BASED_FIXED_PARTITION;
     sf->use_nonrd_pick_mode = 1;
-    sf->search_method = NSTEP;
+    sf->search_method = FAST_HEX;
   }
   if (speed >= 8) {
     int i;