diff options
| author | Angie Chiang <angiebird@google.com> | 2019-03-14 00:13:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-14 00:13:47 +0000 |
| commit | 7e9664934625daf58e33828b2c9fb87e8f1ff75b (patch) | |
| tree | dc735326fd6c2cd88a3e8a0867aaf28afcb15e7b /vp9/encoder/vp9_speed_features.c | |
| parent | ddafa2a11e72791c1e7dc84ed4deea4319fc069b (diff) | |
| parent | 1c07e79ef18efbab652b9296af67503885606663 (diff) | |
| download | libvpx-7e9664934625daf58e33828b2c9fb87e8f1ff75b.tar libvpx-7e9664934625daf58e33828b2c9fb87e8f1ff75b.tar.gz libvpx-7e9664934625daf58e33828b2c9fb87e8f1ff75b.tar.bz2 libvpx-7e9664934625daf58e33828b2c9fb87e8f1ff75b.zip | |
Merge "Refactor speed feature settings"
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index c8e5795ee..b26bf045c 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -791,7 +791,7 @@ static void set_rt_speed_feature_framesize_independent( } } -void vp9_set_speed_features_framesize_dependent(VP9_COMP *cpi) { +void vp9_set_speed_features_framesize_dependent(VP9_COMP *cpi, int speed) { SPEED_FEATURES *const sf = &cpi->sf; const VP9EncoderConfig *const oxcf = &cpi->oxcf; RD_OPT *const rd = &cpi->rd; @@ -805,9 +805,9 @@ void vp9_set_speed_features_framesize_dependent(VP9_COMP *cpi) { sf->rd_ml_partition.search_breakout = 0; if (oxcf->mode == REALTIME) { - set_rt_speed_feature_framesize_dependent(cpi, sf, oxcf->speed); + set_rt_speed_feature_framesize_dependent(cpi, sf, speed); } else if (oxcf->mode == GOOD) { - set_good_speed_feature_framesize_dependent(cpi, sf, oxcf->speed); + set_good_speed_feature_framesize_dependent(cpi, sf, speed); } if (sf->disable_split_mask == DISABLE_ALL_SPLIT) { @@ -836,7 +836,7 @@ void vp9_set_speed_features_framesize_dependent(VP9_COMP *cpi) { sf->adaptive_rd_thresh = 0; } -void vp9_set_speed_features_framesize_independent(VP9_COMP *cpi) { +void vp9_set_speed_features_framesize_independent(VP9_COMP *cpi, int speed) { SPEED_FEATURES *const sf = &cpi->sf; VP9_COMMON *const cm = &cpi->common; MACROBLOCK *const x = &cpi->td.mb; @@ -954,10 +954,9 @@ void vp9_set_speed_features_framesize_independent(VP9_COMP *cpi) { } if (oxcf->mode == REALTIME) - set_rt_speed_feature_framesize_independent(cpi, sf, oxcf->speed, - oxcf->content); + set_rt_speed_feature_framesize_independent(cpi, sf, speed, oxcf->content); else if (oxcf->mode == GOOD) - set_good_speed_feature_framesize_independent(cpi, cm, sf, oxcf->speed); + set_good_speed_feature_framesize_independent(cpi, cm, sf, speed); cpi->diamond_search_sad = vp9_diamond_search_sad; |