From cbe62b9c2d2b006aba52c8eebe7d842e59166fe4 Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 21 Nov 2017 15:04:53 -0800 Subject: [PATCH] vp9-svc: Fix to the layer buffer settings. For the case when the number of temporal layers > 1, the buffer levels (starting/optimal_buffer_level, and maximum_buffer_size) were not scaled properly. In vp9_update_layer_context_change_config(): when setting the layer-buffer levels, fix is to scale the layer-target_bandwidth by the target_bandwidth (which is the full stream bandwidth) instead of the spatial_layer_target. This is needed because prior to the call vp9_update_layer_context_change_config(), set_rc_buffer_sizes() is called which sets the buffer levels based on target bandwidth (which is the full bandwidth for the SVC stream). This fix properly sets the layer-buffer levels based on the layer-bandwidth, and leads to better rate targeting. Small/neutral change in avgPSNR/SSIM metrics on RTC set. Change-Id: Ic0f4f7f3487c37b9a9adb4781ae5edfed7140a57 --- vp9/encoder/vp9_svc_layercontext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index 4b928679c..b33434e62 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -174,7 +174,7 @@ void vp9_update_layer_context_change_config(VP9_COMP *const cpi, RATE_CONTROL *const lrc = &lc->rc; lc->spatial_layer_target_bandwidth = spatial_layer_target; - bitrate_alloc = (float)lc->target_bandwidth / spatial_layer_target; + bitrate_alloc = (float)lc->target_bandwidth / target_bandwidth; lrc->starting_buffer_level = (int64_t)(rc->starting_buffer_level * bitrate_alloc); lrc->optimal_buffer_level = -- 2.50.1