diff options
| author | Jingning Han <jingning@google.com> | 2019-03-13 11:20:28 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2019-03-13 11:21:14 -0700 |
| commit | 1c07e79ef18efbab652b9296af67503885606663 (patch) | |
| tree | b43d03040602686a0388d5f8864ebe99aedacf2e /vp9/encoder/vp9_speed_features.c | |
| parent | 776daa071efc43772f9279ae17a2132fdaf3cb67 (diff) | |
| download | libvpx-1c07e79ef18efbab652b9296af67503885606663.tar libvpx-1c07e79ef18efbab652b9296af67503885606663.tar.gz libvpx-1c07e79ef18efbab652b9296af67503885606663.tar.bz2 libvpx-1c07e79ef18efbab652b9296af67503885606663.zip | |
Refactor speed feature settings
Make the speed feature setup functions take speed argument as
their input.
Change-Id: I542e8f6e04658e5d99e972380a31baab99a4fc23
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; |