diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2019-03-20 11:41:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-20 11:41:01 +0000 |
| commit | 06033be020ad64982ce378472971931e793aab04 (patch) | |
| tree | c78aaf021d51aef701047c64d40c5aa556b5e8be | |
| parent | 7a298d0b03982ff4d3406bc613327634c3db5dd2 (diff) | |
| parent | c48b2c96adab9055e97a84ac11d5ff3dde62afca (diff) | |
| download | libvpx-06033be020ad64982ce378472971931e793aab04.tar libvpx-06033be020ad64982ce378472971931e793aab04.tar.gz libvpx-06033be020ad64982ce378472971931e793aab04.tar.bz2 libvpx-06033be020ad64982ce378472971931e793aab04.zip | |
Merge "Change to mode early breakout rules for FILM mode."
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 46bd196ed..92c115fd1 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -265,14 +265,16 @@ static void set_good_speed_feature_framesize_independent(VP9_COMP *cpi, sf->mv.auto_mv_step_size = 1; sf->adaptive_rd_thresh = 2; sf->mv.subpel_search_level = 1; - sf->mode_skip_start = 10; + if (cpi->oxcf.content != VP9E_CONTENT_FILM) sf->mode_skip_start = 10; sf->adaptive_pred_interp_filter = 1; sf->allow_acl = 0; sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V; sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC_H_V; - sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V; - sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V; + if (cpi->oxcf.content != VP9E_CONTENT_FILM) { + sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V; + sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V; + } sf->recode_tolerance_low = 15; sf->recode_tolerance_high = 30; |