summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_speed_features.c
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2018-07-16 12:25:15 -0700
committerJohann <johannkoenig@google.com>2018-07-16 12:28:16 -0700
commitbc7c99e7eca8d30d005e7d5db8b0aada2459fb15 (patch)
treed9483ec9305dc1c3e5464ebc71c2de0f12f9f227 /vp9/encoder/vp9_speed_features.c
parent2f7e0c32c4d2072982af77650ecacfe30dcd557c (diff)
downloadlibvpx-bc7c99e7eca8d30d005e7d5db8b0aada2459fb15.tar
libvpx-bc7c99e7eca8d30d005e7d5db8b0aada2459fb15.tar.gz
libvpx-bc7c99e7eca8d30d005e7d5db8b0aada2459fb15.tar.bz2
libvpx-bc7c99e7eca8d30d005e7d5db8b0aada2459fb15.zip
Revert "Enable tpl model for speed 0"
This reverts commit 9c2c234a0b8f9c08719ac1fa286988a0a3626fd0. Causes multithreading test failures in 32 bit configurations. BUG=webm:1547 Change-Id: Idb480b206a87b7cd6affbafffde8d8e1b6aee621
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
-rw-r--r--vp9/encoder/vp9_speed_features.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 80adf845e..31c416a71 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -843,11 +843,7 @@ void vp9_set_speed_features_framesize_independent(VP9_COMP *cpi) {
sf->allow_quant_coeff_opt = sf->optimize_coefficients;
sf->quant_opt_thresh = 99.0;
sf->allow_acl = 1;
-#if CONFIG_VP9_HIGHBITDEPTH
sf->enable_tpl_model = 0;
-#else
- sf->enable_tpl_model = 1;
-#endif
for (i = 0; i < TX_SIZES; i++) {
sf->intra_y_mode_mask[i] = INTRA_ALL;