From: Marco Paniconi <marpan@google.com>
Date: Mon, 27 Jan 2020 01:54:02 +0000 (-0800)
Subject: vp9-svc: Fix to resetting rc flags on change_config
X-Git-Tag: v1.9.0-rc1~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78859608302d9ec5bf6e5d04347746b5620bb03f;p=libvpx

vp9-svc: Fix to resetting rc flags on change_config

Condition should account for spatial layers.

Change-Id: I53ef27800d6cba1ae9d313d8f476e5137734d3d8
---

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index d849a2511..131c3c950 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2060,7 +2060,7 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
   // configuration change has a large change in avg_frame_bandwidth.
   // For SVC check for resetting based on spatial layer average bandwidth.
   // Also reset buffer level to optimal level.
-  if (cm->current_video_frame > 0) {
+  if (cm->current_video_frame > (unsigned int)cpi->svc.number_spatial_layers) {
     if (cpi->use_svc) {
       vp9_svc_check_reset_layer_rc_flag(cpi);
     } else {