V4L2 VDA/VEA: Use VIDIOC_G/S_SELECTION for accelerators

media/gpu/v4l2_video_decode_accelerator.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/v4l2_video_decode_accelerator.h"
 
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/videodev2.h>
@@ skipping 2092 matching lines @@
            << ", EGLImage size: " << egl_image_size_.ToString()
            << ", EGLImage plane count: " << egl_image_planes_count_;
 
   return CreateOutputBuffers();
 }
 
 gfx::Size V4L2VideoDecodeAccelerator::GetVisibleSize(
     const gfx::Size& coded_size) {
   DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread());
 
-  struct v4l2_crop crop_arg;
-  memset(&crop_arg, 0, sizeof(crop_arg));
-  crop_arg.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+  struct v4l2_rect* ioctl_rect = NULL;

[wuchengli, 2017/06/29 07:55:22]

s/ioctl_rect/visible_rect/. It's more readable.

+  struct v4l2_selection selection_arg;
+  memset(&selection_arg, 0, sizeof(selection_arg));
+  selection_arg.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  selection_arg.target = V4L2_SEL_TGT_COMPOSE;
 
-  if (device_->Ioctl(VIDIOC_G_CROP, &crop_arg) != 0) {
-    PLOGF(ERROR) << "ioctl() VIDIOC_G_CROP failed";
-    return coded_size;
+  if (device_->Ioctl(VIDIOC_G_SELECTION, &selection_arg) == 0) {
+    ioctl_rect = &selection_arg.r;
   }

[wuchengli, 2017/06/29 07:55:22]

if (device_->Ioctl(VIDIOC_G_SELECTION, &selection_arg) == 0) {
} else {
  CROP
}

 
-  gfx::Rect rect(crop_arg.c.left, crop_arg.c.top, crop_arg.c.width,
-                 crop_arg.c.height);
+  if (ioctl_rect == NULL) {
+    VLOGF(2) << "Fallback to VIDIOC_G_CROP";
+    struct v4l2_crop crop_arg;
+    memset(&crop_arg, 0, sizeof(crop_arg));
+    crop_arg.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+
+    if (device_->Ioctl(VIDIOC_G_CROP, &crop_arg) != 0) {
+      PLOGF(ERROR) << "ioctl() VIDIOC_G_CROP failed";
+      return coded_size;
+    }
+    ioctl_rect = &crop_arg.c;
+  }
+
+  gfx::Rect rect(ioctl_rect->left, ioctl_rect->top, ioctl_rect->width,
+                 ioctl_rect->height);
   VLOGF(2) << "visible rectangle is " << rect.ToString();
   if (!gfx::Rect(coded_size).Contains(rect)) {
     DLOGF(ERROR) << "visible rectangle " << rect.ToString()
                  << " is not inside coded size " << coded_size.ToString();
     return coded_size;
   }
   if (rect.IsEmpty()) {
     DLOGF(ERROR) << "visible size is empty";
     return coded_size;
   }
@@ skipping 506 matching lines @@
       StartResolutionChange();
   }
 }
 
 void V4L2VideoDecodeAccelerator::ImageProcessorError() {
   LOGF(ERROR) << "Image processor error";
   NOTIFY_ERROR(PLATFORM_FAILURE);
 }
 
 }  // namespace media