media/gpu: switch v4l2_jpeg_decode_accelerator to use multi-planar APIs

media/gpu/generic_v4l2_device.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 "media/gpu/generic_v4l2_device.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <libdrm/drm_fourcc.h>
@@ skipping 400 matching lines @@
 #endif
 }
 
 void GenericV4L2Device::EnumerateDevicesForType(Type type) {
   static const std::string kDecoderDevicePattern = "/dev/video-dec";
   static const std::string kEncoderDevicePattern = "/dev/video-enc";
   static const std::string kImageProcessorDevicePattern = "/dev/image-proc";
   static const std::string kJpegDecoderDevicePattern = "/dev/jpeg-dec";
 
   std::string device_pattern;
-  v4l2_buf_type buf_type;
+  std::vector<v4l2_buf_type> buf_types;
   switch (type) {
     case Type::kDecoder:
       device_pattern = kDecoderDevicePattern;
-      buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+      buf_types.push_back(V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
       break;
     case Type::kEncoder:
       device_pattern = kEncoderDevicePattern;
-      buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+      buf_types.push_back(V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
       break;
     case Type::kImageProcessor:
       device_pattern = kImageProcessorDevicePattern;
-      buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+      buf_types.push_back(V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
       break;
     case Type::kJpegDecoder:
       device_pattern = kJpegDecoderDevicePattern;
-      buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+      buf_types.push_back(V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+      buf_types.push_back(V4L2_BUF_TYPE_VIDEO_OUTPUT);
       break;
   }
 
   std::vector<std::string> candidate_paths;
 
   // TODO(posciak): Remove this legacy unnumbered device once
   // all platforms are updated to use numbered devices.
   candidate_paths.push_back(device_pattern);
 
   // We are sandboxed, so we can't query directory contents to check which
   // devices are actually available. Try to open the first 10; if not present,
   // we will just fail to open immediately.
   for (int i = 0; i < 10; ++i) {
     candidate_paths.push_back(
         base::StringPrintf("%s%d", device_pattern.c_str(), i));
   }
 
   Devices devices;
   for (const auto& path : candidate_paths) {
     if (!OpenDevicePath(path, type))
       continue;
 
-    const auto& supported_pixelformats =
-        EnumerateSupportedPixelformats(buf_type);
-    if (!supported_pixelformats.empty()) {
-      DVLOG(1) << "Found device: " << path;
-      devices.push_back(std::make_pair(path, supported_pixelformats));
+    for (const auto& buf_type : buf_types) {
+      const auto& supported_pixelformats =
+          EnumerateSupportedPixelformats(buf_type);
+      if (!supported_pixelformats.empty()) {
+        DVLOG(1) << "Found device: " << path;
+        devices.push_back(std::make_pair(path, supported_pixelformats));
+      }
     }
 
     CloseDevice();
   }
 
   DCHECK_EQ(devices_by_type_.count(type), 0u);
   devices_by_type_[type] = devices;
 }
 
 const GenericV4L2Device::Devices& GenericV4L2Device::GetDevicesForType(
@@ skipping 11 matching lines @@
   for (const auto& device : devices) {
     if (std::find(device.second.begin(), device.second.end(), pixfmt) !=
         device.second.end())
       return device.first;
   }
 
   return std::string();
 }
 
 }  //  namespace media