diff options
| author | Jerome Jiang <jianj@google.com> | 2018-04-13 15:36:39 -0700 |
|---|---|---|
| committer | Jerome Jiang <jianj@google.com> | 2018-04-13 15:36:39 -0700 |
| commit | 2acb7fc1d3b82f32875c890319597a68b44041c2 (patch) | |
| tree | 6d776a71bf001060fa14aff3ff80cf44f44ff743 /vp9/encoder/vp9_encoder.h | |
| parent | 3cc90a6d1849efefbd68175d815efa9e30b52e9f (diff) | |
| download | libvpx-2acb7fc1d3b82f32875c890319597a68b44041c2.tar libvpx-2acb7fc1d3b82f32875c890319597a68b44041c2.tar.gz libvpx-2acb7fc1d3b82f32875c890319597a68b44041c2.tar.bz2 libvpx-2acb7fc1d3b82f32875c890319597a68b44041c2.zip | |
Clean up is_two_pass_svc.
Change-Id: I9e92616471be380d3ba4e2b85399d7eb9f687d2f
Diffstat (limited to 'vp9/encoder/vp9_encoder.h')
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 05bfd6930..303c00a6f 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -860,10 +860,6 @@ YV12_BUFFER_CONFIG *vp9_scale_if_required( void vp9_apply_encoding_flags(VP9_COMP *cpi, vpx_enc_frame_flags_t flags); -static INLINE int is_two_pass_svc(const struct VP9_COMP *const cpi) { - return cpi->use_svc && cpi->oxcf.pass != 0; -} - static INLINE int is_one_pass_cbr_svc(const struct VP9_COMP *const cpi) { return (cpi->use_svc && cpi->oxcf.pass == 0); } @@ -879,9 +875,7 @@ static INLINE int denoise_svc(const struct VP9_COMP *const cpi) { static INLINE int is_altref_enabled(const VP9_COMP *const cpi) { return !(cpi->oxcf.mode == REALTIME && cpi->oxcf.rc_mode == VPX_CBR) && cpi->oxcf.lag_in_frames >= MIN_LOOKAHEAD_FOR_ARFS && - (cpi->oxcf.enable_auto_arf && - (!is_two_pass_svc(cpi) || - cpi->oxcf.ss_enable_auto_arf[cpi->svc.spatial_layer_id])); + cpi->oxcf.enable_auto_arf; } static INLINE void set_ref_ptrs(VP9_COMMON *cm, MACROBLOCKD *xd, |