From 27106e507be4bd25686afd780d7c3c2e2467de38 Mon Sep 17 00:00:00 2001 From: Jerome Jiang Date: Wed, 15 Aug 2018 17:15:45 -0700 Subject: svc: Force the quantizer to be same as that in encoder config. Change-Id: I0377ca2ebf63792d7a27de4b8e7e08b38659ecde --- vp9/encoder/vp9_svc_layercontext.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'vp9/encoder') diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index 3fa25ae14..58eef9134 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -108,6 +108,8 @@ void vp9_init_layer_context(VP9_COMP *const cpi) { lrc->ni_frames = 0; lrc->decimation_count = 0; lrc->decimation_factor = 0; + lrc->worst_quality = oxcf->worst_allowed_q; + lrc->best_quality = oxcf->best_allowed_q; for (i = 0; i < RATE_FACTOR_LEVELS; ++i) { lrc->rate_correction_factors[i] = 1.0; @@ -816,7 +818,8 @@ int vp9_one_pass_cbr_svc_start_layer(VP9_COMP *const cpi) { // Setting the worst/best_quality via the encoder control: SET_SVC_PARAMETERS, // only for non-BYPASS mode for now. - if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS) { + if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS || + svc->use_set_ref_frame_config) { RATE_CONTROL *const lrc = &lc->rc; lrc->worst_quality = vp9_quantizer_to_qindex(lc->max_q); lrc->best_quality = vp9_quantizer_to_qindex(lc->min_q); -- cgit v1.2.3