diff options
| author | Marco Paniconi <marpan@google.com> | 2014-04-03 16:57:44 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-03 16:57:44 -0700 |
| commit | 2a2e8a9d72322e9896afc902c01d0fa9d1238a1b (patch) | |
| tree | cb28d19e5e4315d6f9694448c74d687b2a12848d /vp9/encoder/vp9_speed_features.c | |
| parent | 6ca6073b6d3474f4470a02aa041e9ecab5c83723 (diff) | |
| parent | 0eb88c9064c9e5e163d0771dac974c1ea321c3eb (diff) | |
| download | libvpx-2a2e8a9d72322e9896afc902c01d0fa9d1238a1b.tar libvpx-2a2e8a9d72322e9896afc902c01d0fa9d1238a1b.tar.gz libvpx-2a2e8a9d72322e9896afc902c01d0fa9d1238a1b.tar.bz2 libvpx-2a2e8a9d72322e9896afc902c01d0fa9d1238a1b.zip | |
Merge "Add codec control function for enabling frame_periodic_boost."
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 32d495c0d..7b983f992 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -259,7 +259,7 @@ static void set_rt_speed_feature(VP9_COMMON *cm, sf->min_partition_size = BLOCK_8X8; sf->partition_check = (cm->current_video_frame % sf->last_partitioning_redo_frequency == 1); - sf->force_ref_frame = cm->frame_type == KEY_FRAME || + sf->force_frame_boost = cm->frame_type == KEY_FRAME || (cm->current_video_frame % (sf->last_partitioning_redo_frequency << 1) == 1); sf->max_delta_qindex = (cm->frame_type == KEY_FRAME) ? 20 : 15; @@ -315,7 +315,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) { sf->last_partitioning_redo_frequency = 4; sf->disable_split_mask = 0; sf->mode_search_skip_flags = 0; - sf->force_ref_frame = 0; + sf->force_frame_boost = 0; sf->max_delta_qindex = 0; sf->disable_split_var_thresh = 0; sf->disable_filter_search_var_thresh = 0; @@ -383,4 +383,8 @@ void vp9_set_speed_features(VP9_COMP *cpi) { if (sf->disable_split_mask == DISABLE_ALL_SPLIT) sf->adaptive_pred_interp_filter = 0; + + if (!cpi->oxcf.frame_periodic_boost) { + sf->max_delta_qindex = 0; + } } |