diff options
| author | Marco Paniconi <marpan@google.com> | 2019-03-14 04:51:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-14 04:51:46 +0000 |
| commit | 181631ac16af6e58a11f228bb137d61e23ddc253 (patch) | |
| tree | f02db5ca6773941bddb4816d607c472da0ae668c /vp9/encoder/vp9_encoder.c | |
| parent | 1533bd84f12e5b24b5c2e41d1729942c7aa218ad (diff) | |
| parent | ae365775e77627d474fa26ae0367c3bb90f4ca1e (diff) | |
| download | libvpx-181631ac16af6e58a11f228bb137d61e23ddc253.tar libvpx-181631ac16af6e58a11f228bb137d61e23ddc253.tar.gz libvpx-181631ac16af6e58a11f228bb137d61e23ddc253.tar.bz2 libvpx-181631ac16af6e58a11f228bb137d61e23ddc253.zip | |
Merge "vp9-svc: Reorganize the simulcast mode"
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index fb462c0cb..3c9ae1bb1 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -3114,11 +3114,7 @@ static void update_ref_frames(VP9_COMP *cpi) { } void vp9_update_reference_frames(VP9_COMP *cpi) { - if (cpi->svc.simulcast_mode && is_one_pass_cbr_svc(cpi) && - cpi->common.frame_type == KEY_FRAME) - vp9_svc_update_ref_frame_key_simulcast(cpi); - else - update_ref_frames(cpi); + update_ref_frames(cpi); #if CONFIG_VP9_TEMPORAL_DENOISING vp9_denoiser_update_ref_frame(cpi); |