Remove kIgnoreResolutionLimitsForAcceleratedVideoDecode flag

content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc

Index: content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc b/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc
index cff95f385a9ce7cf2d646c45ff8d1c5b2ee63b03..1372bd104a9c5b80c6e69bc1a6b7a61223ffded8 100644
--- a/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc
+++ b/content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc
@@ -576,8 +576,9 @@ bool V4L2SliceVideoDecodeAccelerator::SetupFormats() {
   }
 
   size_t input_size;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kIgnoreResolutionLimitsForAcceleratedVideoDecode))
+  gfx::Size max_resolution = device_->GetMaxSupportedResolution(
+      input_format_fourcc);
+  if (max_resolution.width() > 1920 && max_resolution.height() > 1088)
     input_size = kInputBufferMaxSizeFor4k;
   else
     input_size = kInputBufferMaxSizeFor1080p;
@@ -2501,42 +2502,12 @@ bool V4L2SliceVideoDecodeAccelerator::CanDecodeOnIOThread() {
 // static
 media::VideoDecodeAccelerator::SupportedProfiles
 V4L2SliceVideoDecodeAccelerator::GetSupportedProfiles() {
-  SupportedProfiles profiles;
   scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);
   if (!device)
-    return profiles;
-
-  SupportedProfile profile;
-  profile.min_resolution.SetSize(16, 16);
-  // NOTE: additional autodetection logic may require updating input buffer size
-  // selection.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kIgnoreResolutionLimitsForAcceleratedVideoDecode))
-    profile.max_resolution.SetSize(4096, 2160);
-  else
-    profile.max_resolution.SetSize(1920, 1088);
-
-  v4l2_fmtdesc fmtdesc;
-  memset(&fmtdesc, 0, sizeof(fmtdesc));
-  fmtdesc.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-  for (; device->Ioctl(VIDIOC_ENUM_FMT, &fmtdesc) == 0; ++fmtdesc.index) {
-    switch (fmtdesc.pixelformat) {
-      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);
-          profiles.push_back(profile);
-        }
-        break;
-      case V4L2_PIX_FMT_VP8_FRAME:
-        profile.profile = media::VP8PROFILE_ANY;
-        profiles.push_back(profile);
-        break;
-    }
-  }
+    return SupportedProfiles();
 
-  return profiles;
+  return device->GetSupportedDecodeProfiles(std::vector<uint32_t>(
+      {V4L2_PIX_FMT_H264_SLICE, V4L2_PIX_FMT_VP8_FRAME}));

[piman, 2015/04/24 03:16:29]

c++11-style initializer lists are currently forbidden by the style guide (see
http://chromium-cpp.appspot.com/).

Note: maybe GetSupportedDecodeProfiles can just take an array/length instead of
a std::vector? Avoids copies etc.

[henryhsu, 2015/04/24 05:25:45]

Done.

 }
 
 }  // namespace content