Remove kIgnoreResolutionLimitsForAcceleratedVideoDecode flag

content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc

 // Copyright 2015 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 <fcntl.h>
 #include <linux/videodev2.h>
 #include <poll.h>
 #include <sys/eventfd.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ skipping 558 matching lines @@
   DCHECK_EQ(state_, kUninitialized);
 
   __u32 input_format_fourcc =
       V4L2Device::VideoCodecProfileToV4L2PixFmt(video_profile_, true);
   if (!input_format_fourcc) {
     NOTREACHED();
     return false;
   }
 
   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;
 
   struct v4l2_format format;
   memset(&format, 0, sizeof(format));
   format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   format.fmt.pix_mp.pixelformat = input_format_fourcc;
   format.fmt.pix_mp.plane_fmt[0].sizeimage = input_size;
   format.fmt.pix_mp.num_planes = input_planes_count_;
@@ skipping 1903 matching lines @@
   SendPictureReady();
 }
 
 bool V4L2SliceVideoDecodeAccelerator::CanDecodeOnIOThread() {
   return true;
 }
 
 // static
 media::VideoDecodeAccelerator::SupportedProfiles
 V4L2SliceVideoDecodeAccelerator::GetSupportedProfiles() {
-  SupportedProfiles profiles;
   scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);
   if (!device)
-    return profiles;
+    return SupportedProfiles();
 
-  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 profiles;
+  uint32_t supported_formats[] = {

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

static const?

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

Since this function is only called once, I think const is enough.

+      V4L2_PIX_FMT_H264_SLICE, V4L2_PIX_FMT_VP8_FRAME};

[piman, 2015/04/27 23:00:29]

nit: } on next line

+  return device->GetSupportedDecodeProfiles(arraysize(supported_formats),
+                                            supported_formats);
 }
 
 }  // namespace content