Add offset support to BitstreamBuffer.

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/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 78 matching lines @@
 
 struct VaapiVideoEncodeAccelerator::InputFrameRef {
   InputFrameRef(const scoped_refptr<media::VideoFrame>& frame,
                 bool force_keyframe)
       : frame(frame), force_keyframe(force_keyframe) {}
   const scoped_refptr<media::VideoFrame> frame;
   const bool force_keyframe;
 };
 
 struct VaapiVideoEncodeAccelerator::BitstreamBufferRef {
-  BitstreamBufferRef(int32 id, scoped_ptr<base::SharedMemory> shm, size_t size)
-      : id(id), shm(shm.Pass()), size(size) {}
+  BitstreamBufferRef(int32 id, scoped_ptr<SharedMemoryRegion> shm)
+      : id(id), shm(shm.Pass()) {}

[Pawel Osciak, 2015/12/31 02:05:54]

std::move

[Owen Lin, 2016/01/04 08:54:18]

Done.

   const int32 id;
   const scoped_ptr<base::SharedMemory> shm;
-  const size_t size;
 };
 
 media::VideoEncodeAccelerator::SupportedProfiles
 VaapiVideoEncodeAccelerator::GetSupportedProfiles() {
   return VaapiWrapper::GetSupportedEncodeProfiles();
 }
 
 static unsigned int Log2OfPowerOf2(unsigned int x) {
   CHECK_GT(x, 0u);
   DCHECK_EQ(x & (x - 1), 0u);
@@ skipping 542 matching lines @@
 void VaapiVideoEncodeAccelerator::UseOutputBitstreamBuffer(
     const media::BitstreamBuffer& buffer) {
   DVLOGF(4) << "id: " << buffer.id();
   DCHECK(child_task_runner_->BelongsToCurrentThread());
 
   if (buffer.size() < output_buffer_byte_size_) {
     NOTIFY_ERROR(kInvalidArgumentError, "Provided bitstream buffer too small");
     return;
   }
 
-  scoped_ptr<base::SharedMemory> shm(
-      new base::SharedMemory(buffer.handle(), false));
-  if (!shm->Map(buffer.size())) {
+  scoped_ptr<SharedMemoryRegion> shm(new SharedMemoryRegion(buffer, false));
+  if (!shm->Map()) {
     NOTIFY_ERROR(kPlatformFailureError, "Failed mapping shared memory.");
     return;
   }
 
-  scoped_ptr<BitstreamBufferRef> buffer_ref(
-      new BitstreamBufferRef(buffer.id(), shm.Pass(), buffer.size()));
+  scoped_ptr<BitstreamBufferRef> buffer_ref(new BitstreamBufferRef(
+      buffer.id(), shm.Pass(), buffer.offset(), buffer.size()));

[Pawel Osciak, 2015/12/31 02:05:54]

I think we don't have this constructor in BitstreamBufferRef?

[Owen Lin, 2016/01/04 08:54:18]

Done.

 
   encoder_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VaapiVideoEncodeAccelerator::UseOutputBitstreamBufferTask,
                  base::Unretained(this), base::Passed(&buffer_ref)));
 }
 
 void VaapiVideoEncodeAccelerator::UseOutputBitstreamBufferTask(
     scoped_ptr<BitstreamBufferRef> buffer_ref) {
   DCHECK(encoder_thread_task_runner_->BelongsToCurrentThread());
@@ skipping 367 matching lines @@
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::EncodeJob()
     : coded_buffer(VA_INVALID_ID), keyframe(false) {
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::~EncodeJob() {
 }
 
 }  // namespace content