summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2020-06-18 11:24:28 -0700
committerJerome Jiang <jianj@google.com>2020-07-30 10:45:53 -0700
commitf0ccdb19f44e2549415fc24b7cc39fa882f5b565 (patch)
treec6fcfe279078e525a630a025a77f0a358923bee4
parent17b2ce11aca791e3fcdb85cc391d5aa9196ef633 (diff)
downloadlibvpx-f0ccdb19f44e2549415fc24b7cc39fa882f5b565.tar.gz
vp9-rtc: Fix to resetting drop_spatial_layer
The reset happens on the base spatial layer, before encoding. But it should be reset on the first_spatial_layer_to_encode, which may not be 0. Change-Id: I38ef686b4459ca7433062adbfe32ef2134e1ad60 (cherry picked from commit 769129fb29fc66720be2b01276a472c334757d2d)
-rw-r--r--vp9/encoder/vp9_svc_layercontext.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c
index 6f23d0b4d..27dc8ec50 100644
--- a/vp9/encoder/vp9_svc_layercontext.c
+++ b/vp9/encoder/vp9_svc_layercontext.c
@@ -864,8 +864,9 @@ int vp9_one_pass_cbr_svc_start_layer(VP9_COMP *const cpi) {
}
}
- // Reset the drop flags for all spatial layers, on the base layer.
- if (svc->spatial_layer_id == 0) {
+ // Reset the drop flags for all spatial layers, on the
+ // first_spatial_layer_to_encode.
+ if (svc->spatial_layer_id == svc->first_spatial_layer_to_encode) {
vp9_zero(svc->drop_spatial_layer);
// TODO(jianj/marpan): Investigate why setting svc->lst/gld/alt_fb_idx
// causes an issue with frame dropping and temporal layers, when the frame