Merge "Enforce key frame placement"

000efb57 · Yaowu Xu · Gerrit Code Review · c2b5a393 · dbae9808 · 000efb57
Commit 000efb57 authored Jan 21, 2014 by Yaowu Xu Committed by Gerrit Code Review Jan 21, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

vp9/encoder/vp9_firstpass.c vp9/encoder/vp9_firstpass.c +2 -1

No files found.
--- 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);