diff options
| author | James Zern <jzern@google.com> | 2018-07-31 15:26:16 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2018-07-31 15:26:16 -0700 |
| commit | 7d750e27e35ebb6eb007a7290f8b2235b9bb3eff (patch) | |
| tree | 3d51bd72775175377c783cabb06e753c289c2395 | |
| parent | ff9e455fe7ae930f5336b464b56e3c83b0331675 (diff) | |
| download | libvpx-7d750e27e35ebb6eb007a7290f8b2235b9bb3eff.tar libvpx-7d750e27e35ebb6eb007a7290f8b2235b9bb3eff.tar.gz libvpx-7d750e27e35ebb6eb007a7290f8b2235b9bb3eff.tar.bz2 libvpx-7d750e27e35ebb6eb007a7290f8b2235b9bb3eff.zip | |
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
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 9 | ||||
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index afe51366d..3be62291b 100644 --- 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 75a8de270..6d179f7bd 100644 --- 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 |