diff options
| author | Hui Su <huisu@google.com> | 2018-12-06 16:53:26 -0800 |
|---|---|---|
| committer | Hui Su <huisu@google.com> | 2018-12-07 15:48:11 -0800 |
| commit | b23a05422e98bc246692df1297474bb0cb78ad51 (patch) | |
| tree | 530ebb108c4b9e484eb6e4faf482c881a7a69aa1 /vp9/encoder/vp9_speed_features.c | |
| parent | c40224631ad20d41f73fc78576dc770169004346 (diff) | |
| download | libvpx-b23a05422e98bc246692df1297474bb0cb78ad51.tar libvpx-b23a05422e98bc246692df1297474bb0cb78ad51.tar.gz libvpx-b23a05422e98bc246692df1297474bb0cb78ad51.tar.bz2 libvpx-b23a05422e98bc246692df1297474bb0cb78ad51.zip | |
Add enum definition for subpel search precision
To improve readability.
Change-Id: Idc08b2068c7d8ba9dadc0d559a3b4d61c2a88c94
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 9b6c69a73..e5c280746 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -533,7 +533,7 @@ static void set_rt_speed_feature_framesize_independent( sf->adjust_partitioning_from_last_frame = cm->last_frame_type != cm->frame_type || (0 == (frames_since_key + 1) % sf->last_partitioning_redo_frequency); - sf->mv.subpel_force_stop = 1; + sf->mv.subpel_force_stop = QUARTER_PEL; for (i = 0; i < TX_SIZES; i++) { sf->intra_y_mode_mask[i] = INTRA_DC_H_V; sf->intra_uv_mode_mask[i] = INTRA_DC; @@ -731,7 +731,7 @@ static void set_rt_speed_feature_framesize_independent( if (cpi->row_mt && cpi->oxcf.max_threads > 1) sf->adaptive_rd_thresh_row_mt = 1; - if (content == VP9E_CONTENT_SCREEN) sf->mv.subpel_force_stop = 3; + if (content == VP9E_CONTENT_SCREEN) sf->mv.subpel_force_stop = FULL_PEL; if (content == VP9E_CONTENT_SCREEN) sf->lpf_pick = LPF_PICK_MINIMAL_LPF; // Only keep INTRA_DC mode for speed 8. if (!is_keyframe) { @@ -767,8 +767,8 @@ static void set_rt_speed_feature_framesize_independent( sf->mv.adapt_subpel_force_stop.mv_thresh = 2; if (cpi->rc.avg_frame_low_motion < 40) sf->mv.adapt_subpel_force_stop.mv_thresh = 1; - sf->mv.adapt_subpel_force_stop.force_stop_below = 1; - sf->mv.adapt_subpel_force_stop.force_stop_above = 2; + sf->mv.adapt_subpel_force_stop.force_stop_below = QUARTER_PEL; + sf->mv.adapt_subpel_force_stop.force_stop_above = HALF_PEL; // Disable partition blocks below 16x16, except for low-resolutions. if (cm->frame_type != KEY_FRAME && cm->width >= 320 && cm->height >= 240) sf->disable_16x16part_nonkey = 1; @@ -876,7 +876,7 @@ void vp9_set_speed_features_framesize_independent(VP9_COMP *cpi) { sf->recode_loop = ALLOW_RECODE_FIRST; sf->mv.subpel_search_method = SUBPEL_TREE; sf->mv.subpel_search_level = 2; - sf->mv.subpel_force_stop = 0; + sf->mv.subpel_force_stop = EIGHTH_PEL; sf->optimize_coefficients = !is_lossless_requested(&cpi->oxcf); sf->mv.reduce_first_step_size = 0; sf->coeff_prob_appx_step = 1; @@ -993,7 +993,7 @@ void vp9_set_speed_features_framesize_independent(VP9_COMP *cpi) { sf->optimize_coefficients = 0; } - if (sf->mv.subpel_force_stop == 3) { + if (sf->mv.subpel_force_stop == FULL_PEL) { // Whole pel only cpi->find_fractional_mv_step = vp9_skip_sub_pixel_tree; } else if (sf->mv.subpel_search_method == SUBPEL_TREE) { |