diff options
| author | Marco <marpan@google.com> | 2017-03-08 16:10:45 -0800 |
|---|---|---|
| committer | Marco <marpan@google.com> | 2017-03-08 16:13:59 -0800 |
| commit | ea3c817ac23d5075df2905e6549cd2dadb4750f6 (patch) | |
| tree | 12f52f9dc7d08a8dea3545a08d659c7ba811656c | |
| parent | 834f26c3b98a99945d0e675956818a79a924998a (diff) | |
| download | libvpx-ea3c817ac23d5075df2905e6549cd2dadb4750f6.tar libvpx-ea3c817ac23d5075df2905e6549cd2dadb4750f6.tar.gz libvpx-ea3c817ac23d5075df2905e6549cd2dadb4750f6.tar.bz2 libvpx-ea3c817ac23d5075df2905e6549cd2dadb4750f6.zip | |
vp9: Enable two speed features for SVC real-time mode.
Enable short_circuit_low_temp_var and limit_newmv_early_exit
for SVC, 1 pass CBR mode.
Change-Id: I77df2b2c6cc40657bb8ea76e19dfc2fdaad6389e
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index dfe132cbd..417c19fd9 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -472,9 +472,9 @@ static void set_rt_speed_feature_framesize_independent( sf->short_circuit_flat_blocks = 1; } if (cpi->oxcf.rc_mode == VPX_CBR && - cpi->oxcf.content != VP9E_CONTENT_SCREEN && !cpi->use_svc) { + cpi->oxcf.content != VP9E_CONTENT_SCREEN) { sf->limit_newmv_early_exit = 1; - sf->bias_golden = 1; + if (!cpi->use_svc) sf->bias_golden = 1; } } @@ -485,8 +485,7 @@ static void set_rt_speed_feature_framesize_independent( sf->mv.search_method = NSTEP; sf->mv.reduce_first_step_size = 1; sf->skip_encode_sb = 0; - if (!cpi->use_svc && cpi->oxcf.rc_mode == VPX_CBR && - content != VP9E_CONTENT_SCREEN) { + if (cpi->oxcf.rc_mode == VPX_CBR && content != VP9E_CONTENT_SCREEN) { // Enable short circuit for low temporal variance. sf->short_circuit_low_temp_var = 1; } |