diff options
| author | Hui Su <huisu@google.com> | 2018-10-18 16:46:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-18 16:46:15 +0000 |
| commit | 9e29417962ce15075f380a9b5b5203d57c08a30a (patch) | |
| tree | 379e2359ebbb1181977732c749bb85ed7e807fc7 | |
| parent | b1f789cf18ffcc976704184f2544d218c88f8ded (diff) | |
| parent | 8d5461eb0aaeca4c5e51b8f142cf7f4d281d8afe (diff) | |
| download | libvpx-9e29417962ce15075f380a9b5b5203d57c08a30a.tar libvpx-9e29417962ce15075f380a9b5b5203d57c08a30a.tar.gz libvpx-9e29417962ce15075f380a9b5b5203d57c08a30a.tar.bz2 libvpx-9e29417962ce15075f380a9b5b5203d57c08a30a.zip | |
Merge "Enable rect partition search for HBD at speed 1"
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 87b417a4b..1af7434f8 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -116,17 +116,13 @@ static void set_good_speed_feature_framesize_dependent(VP9_COMP *cpi, sf->ml_partition_search_breakout_thresh[1] = -1.0f; sf->ml_partition_search_breakout_thresh[2] = -1.0f; } - #if CONFIG_VP9_HIGHBITDEPTH if (cpi->Source->flags & YV12_FLAG_HIGHBITDEPTH) { - sf->use_square_only_thresh_high = BLOCK_4X4; - sf->use_square_only_thresh_low = BLOCK_SIZES; - if (is_720p_or_larger) { - sf->partition_search_breakout_thr.dist = (1 << 23); - sf->use_ml_partition_search_breakout = 0; - } + sf->ml_partition_search_breakout_thresh[0] -= 1.0f; + sf->ml_partition_search_breakout_thresh[1] -= 1.0f; + sf->ml_partition_search_breakout_thresh[2] -= 1.0f; } -#endif +#endif // CONFIG_VP9_HIGHBITDEPTH } if (speed >= 2) { @@ -246,10 +242,6 @@ static void set_good_speed_feature_framesize_independent(VP9_COMP *cpi, sf->ml_prune_rect_partition_threhold[1] = 200; sf->ml_prune_rect_partition_threhold[2] = 200; sf->ml_prune_rect_partition_threhold[3] = 200; -#if CONFIG_VP9_HIGHBITDEPTH - if (cpi->Source->flags & YV12_FLAG_HIGHBITDEPTH) - sf->prune_ref_frame_for_rect_partitions = 0; -#endif // CONFIG_VP9_HIGHBITDEPTH if (oxcf->pass == 2) { TWO_PASS *const twopass = &cpi->twopass; |