Use mojo typemap to simplify the code using DmabufPlane

chrome/gpu/gpu_arc_video_service.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/gpu_arc_video_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 227 matching lines @@
   if (!fd.is_valid())
     return;
   accelerator_->BindSharedMemory(static_cast<PortType>(port), index,
                                  std::move(fd), offset, length);
 }
 
 void GpuArcVideoService::DeprecatedBindDmabuf(::arc::mojom::PortType port,
                                               uint32_t index,
                                               mojo::ScopedHandle dmabuf_handle,
                                               int32_t stride) {
-  std::vector<::arc::mojom::ArcVideoAcceleratorDmabufPlanePtr> planes(1);
-  planes[0]->offset = 0;
-  planes[0]->stride = stride;
+  std::vector<::arc::ArcVideoAcceleratorDmabufPlane> planes(1);

[Luis Héctor Chávez, 2016/11/29 18:25:35]

You can maybe directly initialize the plane with an initializer list:

std::vector<::arc::ArcVideoAcceleratorDmabufPlane> planes{
  {0, stride}
};

[yoshiki, 2016/11/30 17:25:44]

Done.

+  planes[0].offset = 0;
+  planes[0].stride = stride;
 
   BindDmabuf(port, index, std::move(dmabuf_handle), std::move(planes));
 }
 
 void GpuArcVideoService::BindDmabuf(
     ::arc::mojom::PortType port,
     uint32_t index,
     mojo::ScopedHandle dmabuf_handle,
-    std::vector<::arc::mojom::ArcVideoAcceleratorDmabufPlanePtr>
-        dmabuf_planes) {
+    std::vector<::arc::ArcVideoAcceleratorDmabufPlane> dmabuf_planes) {
   DVLOG(2) << "BindDmabuf port=" << port << ", index=" << index;
 
   base::ScopedFD fd = UnwrapFdFromMojoHandle(std::move(dmabuf_handle));
   if (!fd.is_valid())
     return;
 
-  std::vector<ArcVideoAccelerator::DmabufPlane> converted_planes;
   // TODO(yusukes): Use mojo typemaps to simplify the code.

[Luis Héctor Chávez, 2016/11/29 18:25:35]

you can now safely remove this, and the whole L267-L274 block if you also do the
comment in the typemap code.

[yoshiki, 2016/11/30 17:25:44]

Done.

   for (const auto& input : dmabuf_planes) {
-    if (input->offset < 0 || input->stride < 0) {
-      DVLOG(1) << "Invalid offset/stride: " << input->offset << "/"
-               << input->stride;
+    if (input.offset < 0 || input.stride < 0) {
+      DVLOG(1) << "Invalid offset/stride: " << input.offset << "/"
+               << input.stride;
       client_->OnError(
           ::arc::mojom::VideoAcceleratorService::Result::INVALID_ARGUMENT);
       return;
     }
-    converted_planes.emplace_back(input->offset, input->stride);
   }
 
   accelerator_->BindDmabuf(static_cast<PortType>(port), index, std::move(fd),
-                           std::move(converted_planes));
+                           std::move(dmabuf_planes));
 }
 
 void GpuArcVideoService::UseBuffer(::arc::mojom::PortType port,
                                    uint32_t index,
                                    ::arc::mojom::BufferMetadataPtr metadata) {
   DVLOG(2) << "UseBuffer port=" << port << ", index=" << index;
   accelerator_->UseBuffer(static_cast<PortType>(port), index,
                           metadata.To<BufferMetadata>());
 }
 
 void GpuArcVideoService::SetNumberOfOutputBuffers(uint32_t number) {
   DVLOG(2) << "SetNumberOfOutputBuffers number=" << number;
   accelerator_->SetNumberOfOutputBuffers(number);
 }
 
 void GpuArcVideoService::Reset() {
   DVLOG(2) << "Reset";
   accelerator_->Reset();
 }
 
 void GpuArcVideoService::Flush() {
   DVLOG(2) << "Flush";
   accelerator_->Flush();
 }
 
 }  // namespace arc
 }  // namespace chromeos