Vaapi VEA: always generate IDR when keyframe is requested.

content/common/gpu/media/vaapi_video_encode_accelerator.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/vaapi_video_encode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 273 matching lines @@
   memset(&current_pic_, 0, sizeof(current_pic_));
 
   current_pic_.frame_num = frame_num_++;
   frame_num_ %= idr_period_;
 
   if (current_pic_.frame_num % i_period_ == 0 || force_keyframe)
     current_pic_.type = media::H264SliceHeader::kISlice;
   else
     current_pic_.type = media::H264SliceHeader::kPSlice;
 
-  if (current_pic_.frame_num % idr_period_ == 0) {
+  if (current_pic_.frame_num % idr_period_ == 0 || force_keyframe) {
     current_pic_.idr = true;
     last_idr_frame_num_ = current_pic_.frame_num;
     ref_pic_list0_.clear();
   }
 
   if (current_pic_.type != media::H264SliceHeader::kBSlice)
     current_pic_.ref = true;
 
   current_pic_.pic_order_cnt = current_pic_.frame_num * 2;
   current_pic_.top_field_order_cnt = current_pic_.pic_order_cnt;
   current_pic_.pic_order_cnt_lsb = current_pic_.pic_order_cnt;
 
-  current_encode_job_->keyframe =
-      (current_pic_.type == media::H264SliceHeader::kISlice);
+  current_encode_job_->keyframe = current_pic_.idr;
 
   DVLOGF(4) << "Starting a new frame, type: " << current_pic_.type
             << (force_keyframe ? " (forced keyframe)" : "")
             << " frame_num: " << current_pic_.frame_num
             << " POC: " << current_pic_.pic_order_cnt;
 }
 
 void VaapiVideoEncodeAccelerator::EndFrame() {
   // Store the picture on the list of reference pictures and keep the list
   // below maximum size, dropping oldest references.
@@ skipping 740 matching lines @@
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::EncodeJob()
     : coded_buffer(VA_INVALID_ID), keyframe(false) {
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::~EncodeJob() {
 }
 
 }  // namespace content