From bc7c99e7eca8d30d005e7d5db8b0aada2459fb15 Mon Sep 17 00:00:00 2001 From: Johann Date: Mon, 16 Jul 2018 12:25:15 -0700 Subject: 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 --- vp9/encoder/vp9_speed_features.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'vp9/encoder/vp9_speed_features.c') 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; -- cgit v1.2.3