Remove kIgnoreResolutionLimitsForAcceleratedVideoDecode flag

content/common/gpu/media/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 <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/videodev2.h>
 #include <poll.h>
 #include <sys/eventfd.h>
@@ skipping 436 matching lines @@
 // static
 media::VideoDecodeAccelerator::SupportedProfiles
 V4L2VideoDecodeAccelerator::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) {
+    // Get maximum resolution for each format
+    profile.max_resolution = V4L2Device::GetSupportedMaxResolution(
+        device, fmtdesc.pixelformat);
+    if (profile.max_resolution.IsEmpty()) {
+      LOG(ERROR) << "GetSupportedMaxResolution failed for format "
+                 << std::hex << fmtdesc.pixelformat;
+      profile.max_resolution.SetSize(1920, 1088);

[wuchengli, 2015/04/20 14:05:16]

This should be handled in V4L2Device::GetSupportedMaxResolution. Move this
there.

[henryhsu, 2015/04/21 05:56:27]

Done.

+    }
     switch (fmtdesc.pixelformat) {
       case V4L2_PIX_FMT_H264:
         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:
@@ skipping 1313 matching lines @@
   DCHECK(!output_streamon_);
 
   __u32 input_format_fourcc =
       V4L2Device::VideoCodecProfileToV4L2PixFmt(video_profile_, false);
   if (!input_format_fourcc) {
     NOTREACHED();
     return false;
   }
 
   size_t input_size;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kIgnoreResolutionLimitsForAcceleratedVideoDecode))
+  gfx::Size max_resolution = V4L2Device::GetSupportedMaxResolution(
+      device_, input_format_fourcc);
+  if (max_resolution.width() >= 4096 && max_resolution.height() >= 2160)
     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 = 1;
@@ skipping 243 matching lines @@
   gfx::Size new_coded_size(base::checked_cast<int>(format.fmt.pix_mp.width),
                            base::checked_cast<int>(format.fmt.pix_mp.height));
   if (coded_size_ != new_coded_size) {
     DVLOG(3) << "IsResolutionChangeNecessary(): Resolution change detected";
     return true;
   }
   return false;
 }
 
 }  // namespace content