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 268 matching lines @@
   available_va_surface_ids_.push_back(va_surface_id);
   EncodeFrameTask();
 }
 
 void VaapiVideoEncodeAccelerator::BeginFrame(bool force_keyframe) {
   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)
+  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) {

[Pawel Osciak, 2014/10/30 00:09:46]

This is generating IDR on each i_period, which is not what we want. You want to
generate IDR only on force_keyframe or idr_period, but only an I frame on each
i_period.

[hshi1, 2014/10/30 00:18:01]

Done.

     current_pic_.idr = true;
     last_idr_frame_num_ = current_pic_.frame_num;
     ref_pic_list0_.clear();
+  } else {
+    current_pic_.type = media::H264SliceHeader::kPSlice;
   }
 
   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 =
@@ skipping 751 matching lines @@
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::EncodeJob()
     : coded_buffer(VA_INVALID_ID), keyframe(false) {
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::~EncodeJob() {
 }
 
 }  // namespace content