arc: enable use_new_wrapper_types for video_accelerator.mojom

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 93 matching lines @@
     chromeos::arc::ArcVideoAccelerator::Config result;
     result.device_type =
         static_cast<chromeos::arc::ArcVideoAccelerator::Config::DeviceType>(
             input->device_type);
     result.num_input_buffers = input->num_input_buffers;
     result.input_pixel_format = input->input_pixel_format;
     return result;
   }
 };
 
-template <>
-struct TypeConverter<chromeos::arc::ArcVideoAccelerator::DmabufPlane,
-                     arc::mojom::ArcVideoAcceleratorDmabufPlanePtr> {
-  static chromeos::arc::ArcVideoAccelerator::DmabufPlane Convert(
-      const arc::mojom::ArcVideoAcceleratorDmabufPlanePtr& input) {
-    chromeos::arc::ArcVideoAccelerator::DmabufPlane result = {0};
-    if (input->offset < 0 || input->stride < 0) {
-      DVLOG(1) << "Invalid offset/stride: " << input->offset << "/"
-               << input->stride;
-      return result;
-    }
-
-    result.offset = input->offset;
-    result.stride = input->stride;
-    return result;
-  }
-};
-
 }  // namespace mojo
 
 namespace chromeos {
 namespace arc {
 
 GpuArcVideoService::GpuArcVideoService(
     const gpu::GpuPreferences& gpu_preferences)
     : gpu_preferences_(gpu_preferences),
       accelerator_(new ArcGpuVideoDecodeAccelerator(gpu_preferences_)) {}
 
@@ skipping 114 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) {
-  mojo::Array<::arc::mojom::ArcVideoAcceleratorDmabufPlanePtr> planes(1);
+  std::vector<::arc::mojom::ArcVideoAcceleratorDmabufPlanePtr> planes(1);
   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,
-    mojo::Array<::arc::mojom::ArcVideoAcceleratorDmabufPlanePtr>
+    std::vector<::arc::mojom::ArcVideoAcceleratorDmabufPlanePtr>
         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 =
-      dmabuf_planes.To<std::vector<ArcVideoAccelerator::DmabufPlane>>();
+  std::vector<ArcVideoAccelerator::DmabufPlane> converted_planes;

[Luis Héctor Chávez, 2016/11/16 03:04:57]

It's maybe better to create a typemapping for the DmabufPlane to avoid the
conversion altogether. Up to you to do it/delegate it to someone else or leave a
TODO+file a bug.

[Yusuke Sato, 2016/11/16 06:17:49]

Let me do it in a different CL. Added TODO and filed a bug.

+  for (const auto& input : dmabuf_planes) {
+    if (input->offset < 0 || input->stride < 0) {
+      DVLOG(1) << "Invalid offset/stride: " << input->offset << "/"
+               << input->stride;
+      converted_planes.emplace_back(0, 0);
+    } else {
+      converted_planes.emplace_back(input->offset, input->stride);
+    }
+  }
 
   accelerator_->BindDmabuf(static_cast<PortType>(port), index, std::move(fd),
                            std::move(converted_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,
@@ skipping 10 matching lines @@
   accelerator_->Reset();
 }
 
 void GpuArcVideoService::Flush() {
   DVLOG(2) << "Flush";
   accelerator_->Flush();
 }
 
 }  // namespace arc
 }  // namespace chromeos