v4l2 accelerators: use V4L2_CAP_VIDEO_M2M_MPLANE capability.

content/common/gpu/media/v4l2_video_decode_accelerator.cc

Index: content/common/gpu/media/v4l2_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/v4l2_video_decode_accelerator.cc b/content/common/gpu/media/v4l2_video_decode_accelerator.cc
index 64672fccdd75c83bdc7c0885a3134edbbb429d4e..f393fde0b35fb305eb283f73785186d034888e64 100644
--- a/content/common/gpu/media/v4l2_video_decode_accelerator.cc
+++ b/content/common/gpu/media/v4l2_video_decode_accelerator.cc
@@ -256,15 +256,17 @@ bool V4L2VideoDecodeAccelerator::Initialize(const Config& config,
 
   // Capabilities check.
   struct v4l2_capability caps;
-  const __u32 kCapsRequired =
-      V4L2_CAP_VIDEO_CAPTURE_MPLANE |
-      V4L2_CAP_VIDEO_OUTPUT_MPLANE |
-      V4L2_CAP_STREAMING;
+  const __u32 kCapsRequired = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
   IOCTL_OR_ERROR_RETURN_FALSE(VIDIOC_QUERYCAP, &caps);
   if ((caps.capabilities & kCapsRequired) != kCapsRequired) {
-    LOG(ERROR) << "Initialize(): ioctl() failed: VIDIOC_QUERYCAP"
-        ", caps check failed: 0x" << std::hex << caps.capabilities;
-    return false;
+    const __u32 kCapsRequiredCompat = V4L2_CAP_VIDEO_CAPTURE_MPLANE |

[Pawel Osciak, 2015/12/29 10:07:47]

Please add a short comment here and in VEA that this cap combination is
deprecated, but some older drivers may still be returning it.

[wuchengli, 2015/12/29 11:28:07]

Done.

+                                      V4L2_CAP_VIDEO_OUTPUT_MPLANE |
+                                      V4L2_CAP_STREAMING;
+    if ((caps.capabilities & kCapsRequiredCompat) != kCapsRequiredCompat) {
+      LOG(ERROR) << "Initialize(): ioctl() failed: VIDIOC_QUERYCAP"
+          ", caps check failed: 0x" << std::hex << caps.capabilities;
+      return false;
+    }
   }
 
   if (!SetupFormats())