diff options
| author | Marco Paniconi <marpan@google.com> | 2014-04-10 15:26:59 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-10 15:26:59 -0700 |
| commit | 65d4f6916e6c3007c9e9fc8992e59a9b990a90d7 (patch) | |
| tree | ba4d6ec069864b817abdf042e30c5262e2c24d5b /vp9/encoder | |
| parent | a5ce28a15a95be43d07225e38509baf0ecd963cb (diff) | |
| parent | a39b201344b2a7aebb0bde8deae3914504f48478 (diff) | |
| download | libvpx-65d4f6916e6c3007c9e9fc8992e59a9b990a90d7.tar libvpx-65d4f6916e6c3007c9e9fc8992e59a9b990a90d7.tar.gz libvpx-65d4f6916e6c3007c9e9fc8992e59a9b990a90d7.tar.bz2 libvpx-65d4f6916e6c3007c9e9fc8992e59a9b990a90d7.zip | |
Merge "Remove the unneeded output_framerate from svc."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 18 | ||||
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index b4e883fb5..6a9ffd25d 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -1258,17 +1258,25 @@ static int calc_pframe_target_size_one_pass_cbr(const VP9_COMP *cpi) { static int calc_iframe_target_size_one_pass_cbr(const VP9_COMP *cpi) { const RATE_CONTROL *rc = &cpi->rc; + const VP9_CONFIG *oxcf = &cpi->oxcf; + const SVC *const svc = &cpi->svc; int target; - if (cpi->common.current_video_frame == 0) { target = ((cpi->oxcf.starting_buffer_level / 2) > INT_MAX) ? INT_MAX : (int)(cpi->oxcf.starting_buffer_level / 2); } else { - const int initial_boost = 32; - int kf_boost = MAX(initial_boost, (int)(2 * cpi->output_framerate - 16)); - if (rc->frames_since_key < cpi->output_framerate / 2) { + int kf_boost = 32; + double framerate = oxcf->framerate; + if (svc->number_temporal_layers > 1 && + oxcf->end_usage == USAGE_STREAM_FROM_SERVER) { + // Use the layer framerate for temporal layers CBR mode. + const LAYER_CONTEXT *lc = &svc->layer_context[svc->temporal_layer_id]; + framerate = lc->framerate; + } + kf_boost = MAX(kf_boost, (int)(2 * framerate - 16)); + if (rc->frames_since_key < framerate / 2) { kf_boost = (int)(kf_boost * rc->frames_since_key / - (cpi->output_framerate / 2)); + (framerate / 2)); } target = ((16 + kf_boost) * rc->av_per_frame_bandwidth) >> 4; } diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index c2b6263f0..9b3fc6eab 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -178,7 +178,6 @@ void vp9_restore_layer_context(VP9_COMP *const cpi) { cpi->oxcf.starting_buffer_level = lc->starting_buffer_level; cpi->oxcf.optimal_buffer_level = lc->optimal_buffer_level; cpi->oxcf.maximum_buffer_size = lc->maximum_buffer_size; - cpi->output_framerate = lc->framerate; // Reset the frames_since_key and frames_to_key counters to their values // before the layer restore. Keep these defined for the stream (not layer). if (cpi->svc.number_temporal_layers > 1) { @@ -197,7 +196,6 @@ void vp9_save_layer_context(VP9_COMP *const cpi) { lc->starting_buffer_level = oxcf->starting_buffer_level; lc->optimal_buffer_level = oxcf->optimal_buffer_level; lc->maximum_buffer_size = oxcf->maximum_buffer_size; - lc->framerate = cpi->output_framerate; } void vp9_init_second_pass_spatial_svc(VP9_COMP *cpi) { |