vp9: enable tpl model in high-bitdepth w/8-bit output

this keeps the output between CONFIG_VP9_HIGHBITDEPTH=0/1 the same when
targeting 8-bit.

Change-Id: I5290681fdd3e0c1620578e5f804f68010c6dd210

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index afe51366de6f6df8dab052cf337c3326da0c7247..3be62291bdabf6b798e63a847f2780bb75445d03 100644 (file)
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -6020,15 +6020,6 @@ void setup_tpl_stats(VP9_COMP *cpi) {
   int tpl_group_frames = 0;
   int frame_idx;
 
-  // TODO(jingning): Make the model support high bit-depth route.
-#if CONFIG_VP9_HIGHBITDEPTH
-  (void)gf_picture;
-  (void)gf_group;
-  (void)tpl_group_frames;
-  (void)frame_idx;
-  return;
-#endif
-
   init_gop_frames(cpi, gf_picture, gf_group, &tpl_group_frames);
 
   init_tpl_stats(cpi);

diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 75a8de27071829e85124457fb97fab8d56afee4d..6d179f7bd6b86e41f50a8ab84efa5d3eb9ff8c42 100644 (file)
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -846,7 +846,8 @@ void vp9_set_speed_features_framesize_independent(VP9_COMP *cpi) {
   sf->quant_opt_thresh = 99.0;
   sf->allow_acl = 1;
 #if CONFIG_VP9_HIGHBITDEPTH
-  sf->enable_tpl_model = 0;
+  // TODO(jingning): Make the model support high bit-depth route.
+  sf->enable_tpl_model = !cm->use_highbitdepth;
 #else
   sf->enable_tpl_model = 1;
 #endif