Remove kIgnoreResolutionLimitsForAcceleratedVideoDecode flag

content/common/gpu/media/v4l2_device.cc

Index: content/common/gpu/media/v4l2_device.cc
diff --git a/content/common/gpu/media/v4l2_device.cc b/content/common/gpu/media/v4l2_device.cc
index 7629bac5e19109bc35c7eb065b72950a5b4582e0..a511f025246103f02027cbc69f2c1ebf312dc347 100644
--- a/content/common/gpu/media/v4l2_device.cc
+++ b/content/common/gpu/media/v4l2_device.cc
@@ -13,6 +13,9 @@
 
 namespace content {
 
+V4L2Device::V4L2Device(Type type) : type_(type) {
+}
+
 V4L2Device::~V4L2Device() {
 }
 
@@ -197,4 +200,72 @@ gfx::Size V4L2Device::CodedSizeFromV4L2Format(struct v4l2_format format) {
   return coded_size;
 }
 
+gfx::Size V4L2Device::GetMaxSupportedResolution(uint32_t pixelformat) {
+  gfx::Size max_resolution;
+  v4l2_frmsizeenum frame_size;
+  memset(&frame_size, 0, sizeof(frame_size));
+  frame_size.pixel_format = pixelformat;
+  for (; Ioctl(VIDIOC_ENUM_FRAMESIZES, &frame_size) == 0; ++frame_size.index) {
+    if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE &&
+        frame_size.discrete.width >=
+            base::checked_cast<uint32_t>(max_resolution.width()) &&
+        frame_size.discrete.height >=
+            base::checked_cast<uint32_t>(max_resolution.height())) {
+      max_resolution.SetSize(frame_size.discrete.width,
+                             frame_size.discrete.height);
+    } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE ||
+               frame_size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) {
+      max_resolution.SetSize(frame_size.stepwise.max_width,
+                             frame_size.stepwise.max_height);
+      break;
+    }
+  }
+  if (max_resolution.IsEmpty()) {
+    LOG(ERROR) << "GetMaxSupportedResolution failed for fourcc " << std::hex
+               << pixelformat << ", fall back to 1920x1088.";
+    max_resolution.SetSize(1920, 1088);
+  }
+  return max_resolution;
+}
+
+media::VideoDecodeAccelerator::SupportedProfiles
+V4L2Device::GetSupportedDecodeProfiles(
+    const std::vector<uint32_t>& pixelformats) {
+  DCHECK_EQ(type_, kDecoder);
+  media::VideoDecodeAccelerator::SupportedProfiles profiles;
+  media::VideoDecodeAccelerator::SupportedProfile profile;
+  profile.min_resolution.SetSize(16, 16);
+  v4l2_fmtdesc fmtdesc;
+  memset(&fmtdesc, 0, sizeof(fmtdesc));
+  fmtdesc.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+
+  for (; Ioctl(VIDIOC_ENUM_FMT, &fmtdesc) == 0; ++fmtdesc.index) {
+    if (std::find(pixelformats.begin(), pixelformats.end(),
+                  fmtdesc.pixelformat) == pixelformats.end())
+      continue;
+    profile.max_resolution = GetMaxSupportedResolution(fmtdesc.pixelformat);
+    switch (fmtdesc.pixelformat) {

[Pawel Osciak, 2015/04/24 05:55:51]

We may start missing something in the future if pixelformats and
fmtdesc.pixelformat match, but we don't have a case below for it. We should
probably add a default case here. Maybe something like this:

  default:
    NOTREACHED() << "Unhandled pixelformat " << fmtdesc.pixelformat;
    break;

[henryhsu, 2015/04/24 07:07:29]

Done.

+      case V4L2_PIX_FMT_H264:
+      case V4L2_PIX_FMT_H264_SLICE:
+        for (uint32 media_profile = media::H264PROFILE_MIN;
+             media_profile <= media::H264PROFILE_MAX; ++media_profile) {
+          profile.profile =
+              static_cast<media::VideoCodecProfile>(media_profile);

[Pawel Osciak, 2015/04/24 05:55:51]

Is this an error/warning if we remove the cast?

[henryhsu, 2015/04/24 07:07:29]

Yes, we have invalid conversion error without the cast.

+          profiles.push_back(profile);
+        }
+        break;
+      case V4L2_PIX_FMT_VP8:
+      case V4L2_PIX_FMT_VP8_FRAME:
+        profile.profile = media::VP8PROFILE_ANY;

[Pawel Osciak, 2015/04/24 05:55:51]

To be supercorrect and pedantic, we could consider:

while(...) {
  ...

  switch() {
    case ...H264...:
      min_profile = media::H264PROFILE_MIN;
      max_profile = media::H264PROFILE_MAX;
      break;

    case ...VP8...:
      min_profile = media::VP8PROFILE_MIN;
      max_profile = media::VP8PROFILE_MAX:
      break;

     etc...

    default:
      NOTREACHED() << ...
      continue;
  }

  for (profile = min; profile <= max; ++profile)
    profiles.push_back(profile);
}

[henryhsu, 2015/04/24 07:07:29]

Done.

+        profiles.push_back(profile);
+        break;
+      case V4L2_PIX_FMT_VP9:
+        profile.profile = media::VP9PROFILE_ANY;
+        profiles.push_back(profile);
+        break;
+    }
+  }
+  return profiles;
+}
+
 }  //  namespace content