shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -6020,15 +6020,6 @@

   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);

--- a/vp9/encoder/vp9_speed_features.c

+++ b/vp9/encoder/vp9_speed_features.c

@@ -846,7 +846,8 @@

   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