summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Wilkins <paulwilkins@google.com>2014-04-14 12:08:42 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-04-14 12:08:42 -0700
commit096b44f43b15ff47da48b28d531411a4c831bd84 (patch)
tree60f67eaff8844a9d88e00b5753c70a2a04fadbef
parent07dddfa3fdf11c08c8b91b96fe94907be228f2cc (diff)
parent0639b5cff5ac3e476f0ee76c3c3f51fdc9fd2758 (diff)
downloadlibvpx-096b44f43b15ff47da48b28d531411a4c831bd84.tar
libvpx-096b44f43b15ff47da48b28d531411a4c831bd84.tar.gz
libvpx-096b44f43b15ff47da48b28d531411a4c831bd84.tar.bz2
libvpx-096b44f43b15ff47da48b28d531411a4c831bd84.zip
Merge "Speed 2 alternative balance."
-rw-r--r--vp9/encoder/vp9_speed_features.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index adad800b6..f1fefe4ef 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -73,8 +73,8 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,
}
if (speed >= 2) {
- sf->tx_size_search_method = vp9_frame_is_boosted(cpi) ? USE_FULL_RD
- : USE_LARGESTALL;
+ sf->tx_size_search_method = frame_is_intra_only(cm) ? USE_FULL_RD
+ : USE_LARGESTALL;
if (MIN(cm->width, cm->height) >= 720)
sf->disable_split_mask = cm->show_frame ? DISABLE_ALL_SPLIT