From: Yaowu Xu <yaowu@google.com>
Date: Tue, 21 Jan 2014 22:07:45 +0000 (-0800)
Subject: Enforce key frame placement
X-Git-Tag: v1.4.0~2630^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbae98082c1129191db46d94ddb45609fc7897c4;p=libvpx

Enforce key frame placement

Change-Id: I2f85c6b058638571d68a7209779de8ca8168934f
---

diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index 0a5af18cb..fe57af284 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -2060,7 +2060,8 @@ void vp9_get_second_pass_params(VP9_COMP *cpi) {
   this_frame_coded_error = this_frame.coded_error;
 
   // keyframe and section processing !
-  if (rc->frames_to_key == 0) {
+  if (rc->frames_to_key == 0 ||
+      (cpi->common.frame_flags & FRAMEFLAGS_KEY)) {
     // Define next KF group and assign bits to it
     this_frame_copy = this_frame;
     find_next_key_frame(cpi, &this_frame_copy);