Add stride for imported Dmabuf in ArcVideoAccelerator.

chrome/gpu/arc_gpu_video_decode_accelerator.cc

 // Copyright 2016 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 "chrome/gpu/arc_gpu_video_decode_accelerator.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "content/public/gpu/gpu_video_decode_accelerator_factory.h"
 #include "media/base/video_frame.h"
 
 namespace chromeos {
 namespace arc {
 
 ArcGpuVideoDecodeAccelerator::InputRecord::InputRecord(
     int32_t bitstream_buffer_id,
     uint32_t buffer_index,
     int64_t timestamp)
     : bitstream_buffer_id(bitstream_buffer_id),
       buffer_index(buffer_index),
       timestamp(timestamp) {}
 
-ArcGpuVideoDecodeAccelerator::InputBufferInfo::InputBufferInfo()
-    : offset(0), length(0) {}
+ArcGpuVideoDecodeAccelerator::InputBufferInfo::InputBufferInfo() = default;
 
 ArcGpuVideoDecodeAccelerator::InputBufferInfo::InputBufferInfo(
-    InputBufferInfo&& other)
-    : handle(std::move(other.handle)),
-      offset(other.offset),
-      length(other.length) {}
+    InputBufferInfo&& other) = default;
 
-ArcGpuVideoDecodeAccelerator::InputBufferInfo::~InputBufferInfo() {}
+ArcGpuVideoDecodeAccelerator::InputBufferInfo::~InputBufferInfo() = default;
+
+ArcGpuVideoDecodeAccelerator::OutputBufferInfo::OutputBufferInfo() = default;
+
+ArcGpuVideoDecodeAccelerator::OutputBufferInfo::OutputBufferInfo(
+    OutputBufferInfo&& other) = default;
+
+ArcGpuVideoDecodeAccelerator::OutputBufferInfo::~OutputBufferInfo() = default;
 
 ArcGpuVideoDecodeAccelerator::ArcGpuVideoDecodeAccelerator()
     : pending_eos_output_buffer_(false),
       arc_client_(nullptr),
       next_bitstream_buffer_id_(0),
       output_buffer_size_(0) {}
 
 ArcGpuVideoDecodeAccelerator::~ArcGpuVideoDecodeAccelerator() {}
 
 namespace {
@@ skipping 105 matching lines @@
     return;
   }
   InputBufferInfo* input_info = &input_buffer_info_[index];
   input_info->handle = std::move(ashmem_fd);
   input_info->offset = offset;
   input_info->length = length;
 }
 
 void ArcGpuVideoDecodeAccelerator::BindDmabuf(PortType port,
                                               uint32_t index,
-                                              base::ScopedFD dmabuf_fd) {
+                                              base::ScopedFD dmabuf_fd,
+                                              int32_t stride) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!vda_) {
     DLOG(ERROR) << "VDA not initialized";
     return;
   }
 
   if (port != PORT_OUTPUT) {
     DLOG(ERROR) << "Dmabuf is only supported for input";
     arc_client_->OnError(INVALID_ARGUMENT);
     return;
   }
   if (!ValidatePortAndIndex(port, index)) {
     arc_client_->OnError(INVALID_ARGUMENT);
     return;
   }
-  buffers_pending_import_[index] = std::move(dmabuf_fd);
+  OutputBufferInfo& info = buffers_pending_import_[index];
+  info.handle = std::move(dmabuf_fd);
+  info.stride = stride;
 }
 
 void ArcGpuVideoDecodeAccelerator::UseBuffer(PortType port,
                                              uint32_t index,
                                              const BufferMetadata& metadata) {
   DVLOG(5) << "UseBuffer(port=" << port << ", index=" << index
            << ", metadata=(bytes_used=" << metadata.bytes_used
            << ", timestamp=" << metadata.timestamp << ")";
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!vda_) {
@@ skipping 167 matching lines @@
 }
 
 void ArcGpuVideoDecodeAccelerator::SendEosIfNeededOrReusePicture(
     uint32_t index) {
   if (pending_eos_output_buffer_) {
     BufferMetadata metadata;
     metadata.flags = BUFFER_FLAG_EOS;
     arc_client_->OnBufferDone(PORT_OUTPUT, index, metadata);
     pending_eos_output_buffer_ = false;
   } else {
-    if (buffers_pending_import_[index].is_valid()) {
+    OutputBufferInfo& info = buffers_pending_import_[index];
+    if (info.handle.is_valid()) {
+      gfx::GpuMemoryBufferHandle handle;
+#if defined(USE_OZONE)
+      handle.native_pixmap_handle.fd =
+          base::FileDescriptor(info.handle.release(), true);

[dcheng, 2016/05/07 06:22:56]

(My question about how this fd ends up getting freed from the other CL applies
here as well =)

[Owen Lin, 2016/05/09 07:30:16]

As the reply in the other CL. The fd will be managed by ScopedFD in the
implementation of the ImportBufferForPicture(). 

+      handle.native_pixmap_handle.stride = info.stride;
+#endif
       std::vector<gfx::GpuMemoryBufferHandle> buffers;

[dcheng, 2016/05/07 06:22:56]

I have good news. Just write:

std::vector<gfx::GpuMemoryBufferHandle> buffers{handle};

[Owen Lin, 2016/05/09 07:30:16]

Thanks. It's really nice.

-      buffers.push_back(gfx::GpuMemoryBufferHandle());
-#if defined(USE_OZONE)
-      buffers.back().native_pixmap_handle.fd =
-          base::FileDescriptor(buffers_pending_import_[index].release(), true);
-#endif
+      buffers.push_back(handle);
       vda_->ImportBufferForPicture(index, buffers);
     } else {
       vda_->ReusePictureBuffer(index);
     }
   }
 }
 
 void ArcGpuVideoDecodeAccelerator::CreateInputRecord(
     int32_t bitstream_buffer_id,
     uint32_t buffer_index,
@@ skipping 36 matching lines @@
       }
       return true;
     default:
       DLOG(ERROR) << "Invalid port: " << port;
       return false;
   }
 }
 
 }  // namespace arc
 }  // namespace chromeos