ref: 7621a19aa53c7b26b4bf4ba30f2c7f65f8503f9d
parent: 002172efd68410227c67280479b11db580346a9e
parent: 48a762731695c14d3810f0396b5aa53ba0c725dc
author: Deb Mukherjee <debargha@google.com>
date: Wed Nov 12 22:27:11 EST 2014
Merge "Vidyo: Turn off keyframes in higher spatial layers"
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3635,6 +3635,13 @@
if (source != NULL) {
cm->show_frame = 1;
cm->intra_only = 0;
+ // if the flags indicate intra frame, but if the current picture is for
+ // non-zero spatial layer, it should not be an intra picture.
+ // TODO(Won Kap): this needs to change if per-layer intra frame is
+ // allowed.
+ if ((source->flags | VPX_EFLAG_FORCE_KF) && cpi->svc.spatial_layer_id) {
+ source->flags &= ~(unsigned int)(VPX_EFLAG_FORCE_KF);
+ }
// Check to see if the frame should be encoded as an arf overlay.
check_src_altref(cpi, source);