diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2017-11-13 16:32:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-13 16:32:39 +0000 |
| commit | f5817fa612d39b3b46b3164c17ab9d5f3d7bc8c8 (patch) | |
| tree | 2365d5753ce0b40bd0e7ea9e9a8c5354de20fdfc /vp9/encoder/vp9_speed_features.c | |
| parent | 8e6022844fdf3e97cfe10659f386299d716736ab (diff) | |
| parent | 93e83fd7cfd7322da61960e8e8e5a5685b5245fb (diff) | |
| download | libvpx-f5817fa612d39b3b46b3164c17ab9d5f3d7bc8c8.tar libvpx-f5817fa612d39b3b46b3164c17ab9d5f3d7bc8c8.tar.gz libvpx-f5817fa612d39b3b46b3164c17ab9d5f3d7bc8c8.tar.bz2 libvpx-f5817fa612d39b3b46b3164c17ab9d5f3d7bc8c8.zip | |
Merge "CVBR command line option."
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 766b45874..14df8daba 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -157,6 +157,7 @@ static void set_good_speed_feature_framesize_independent(VP9_COMP *cpi, VP9_COMMON *cm, SPEED_FEATURES *sf, int speed) { + const VP9EncoderConfig *const oxcf = &cpi->oxcf; const int boosted = frame_is_boosted(cpi); int i; @@ -182,7 +183,7 @@ static void set_good_speed_feature_framesize_independent(VP9_COMP *cpi, } if (speed >= 1) { - if (cpi->oxcf.pass == 2) { + if (oxcf->pass == 2) { TWO_PASS *const twopass = &cpi->twopass; if ((twopass->fr_content_type == FC_GRAPHICS_ANIMATION) || vp9_internal_image_edge(cpi)) { @@ -225,16 +226,16 @@ static void set_good_speed_feature_framesize_independent(VP9_COMP *cpi, } if (speed >= 2) { -#ifdef CORPUS_VBR_EXPERIMENT - sf->recode_loop = ALLOW_RECODE_FIRST; -#else - sf->recode_loop = ALLOW_RECODE_KFARFGF; -#endif + if (oxcf->vbr_corpus_complexity) + sf->recode_loop = ALLOW_RECODE_FIRST; + else + sf->recode_loop = ALLOW_RECODE_KFARFGF; + sf->tx_size_search_method = frame_is_boosted(cpi) ? USE_FULL_RD : USE_LARGESTALL; // Reference masking is not supported in dynamic scaling mode. - sf->reference_masking = cpi->oxcf.resize_mode != RESIZE_DYNAMIC ? 1 : 0; + sf->reference_masking = oxcf->resize_mode != RESIZE_DYNAMIC ? 1 : 0; sf->mode_search_skip_flags = (cm->frame_type == KEY_FRAME) |