diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2014-05-27 15:40:33 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2014-05-28 14:15:45 +0100 |
| commit | 39c91d84ed3f0e7a8828b17da86c2bc1656bb24b (patch) | |
| tree | 3a9d3891c5d466f6fbb7dcc85ca934d7a351dc0c /vp9/encoder/vp9_svc_layercontext.c | |
| parent | 8df1b869a28496f4e6d278f14732d4d9d0a42fbc (diff) | |
| download | libvpx-39c91d84ed3f0e7a8828b17da86c2bc1656bb24b.tar libvpx-39c91d84ed3f0e7a8828b17da86c2bc1656bb24b.tar.gz libvpx-39c91d84ed3f0e7a8828b17da86c2bc1656bb24b.tar.bz2 libvpx-39c91d84ed3f0e7a8828b17da86c2bc1656bb24b.zip | |
Re-factor some duplicate code.
Change-Id: I89a1dbea39c50c7633f746d9c93fec3a289f1b42
Diffstat (limited to 'vp9/encoder/vp9_svc_layercontext.c')
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index 48aa64c13..97241dbd0 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -150,20 +150,7 @@ void vp9_update_spatial_layer_framerate(VP9_COMP *const cpi, double framerate) { oxcf->two_pass_vbrmin_section / 100); lrc->max_frame_bandwidth = (int)(((int64_t)lrc->avg_frame_bandwidth * oxcf->two_pass_vbrmax_section) / 100); - lrc->max_gf_interval = 16; - - lrc->static_scene_max_gf_interval = cpi->oxcf.key_freq >> 1; - - if (oxcf->play_alternate && oxcf->lag_in_frames) { - if (lrc->max_gf_interval > oxcf->lag_in_frames - 1) - lrc->max_gf_interval = oxcf->lag_in_frames - 1; - - if (lrc->static_scene_max_gf_interval > oxcf->lag_in_frames - 1) - lrc->static_scene_max_gf_interval = oxcf->lag_in_frames - 1; - } - - if (lrc->max_gf_interval > lrc->static_scene_max_gf_interval) - lrc->max_gf_interval = lrc->static_scene_max_gf_interval; + vp9_rc_set_gf_max_interval(oxcf, lrc); } void vp9_restore_layer_context(VP9_COMP *const cpi) { |