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() >= 4096 && max_resolution.height() >= 2160)

[Pawel Osciak, 2015/04/22 08:50:55]

This should be > 1080p, not > 4k.

[henryhsu, 2015/04/23 03:56:43]

Done.

     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 1902 matching lines @@
   picture_clearing_count_--;
   SendPictureReady();
 }
 
 bool V4L2SliceVideoDecodeAccelerator::CanDecodeOnIOThread() {
   return true;
 }
 
 // static
 media::VideoDecodeAccelerator::SupportedProfiles
 V4L2SliceVideoDecodeAccelerator::GetSupportedProfiles() {

[Pawel Osciak, 2015/04/22 08:50:55]

Could this method be unified with V4L2VDA::GetSupporteProfiles(), taking a
vector of fourccs as an argument to handle different pixelformats supported by
each VDA?

[henryhsu, 2015/04/23 03:56:43]

Done.

   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

[Pawel Osciak, 2015/04/22 08:50:56]

I feel this comment doesn't really add anything, the code is self-explanatory.
I'd suggest removing it.

[henryhsu, 2015/04/23 03:56:43]

Done.

+    profile.max_resolution = device->GetMaxSupportedResolution(
+        fmtdesc.pixelformat);
     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;
 }
 
 }  // namespace content