Add VDA supported profile to GPUInfo.

media/filters/gpu_video_decoder.cc

 // Copyright (c) 2012 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 "media/filters/gpu_video_decoder.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 79 matching lines @@
     base::MessageLoop::current()->PostTask(FROM_HERE, closure);
     return;
   }
 
   DCHECK(pending_reset_cb_.is_null());
   pending_reset_cb_ = BindToCurrentLoop(closure);
 
   vda_->Reset();
 }
 
-static bool IsCodedSizeSupported(const gfx::Size& coded_size) {
-#if defined(OS_WIN)
-  // Windows Media Foundation H.264 decoding does not support decoding videos
-  // with any dimension smaller than 48 pixels:
-  // http://msdn.microsoft.com/en-us/library/windows/desktop/dd797815
-  if (coded_size.width() < 48 || coded_size.height() < 48)
-    return false;
-#endif
-
-  // Only non-Windows, Ivy Bridge+ platforms can support more than 1920x1080.
-  // We test against 1088 to account for 16x16 macroblocks.
-  if (coded_size.width() <= 1920 && coded_size.height() <= 1088)
+static bool IsCodedSizeSupported(const gfx::Size& coded_size,
+                                 const gfx::Size& min_resolution,
+                                 const gfx::Size& max_resolution) {
+  if (coded_size.width() <= max_resolution.width() &&
+      coded_size.height() <= max_resolution.height() &&
+      coded_size.width() >= min_resolution.width() &&
+      coded_size.height() >= min_resolution.height()) {
     return true;
-
-  // NOTE: additional autodetection logic may require updating input buffer size
-  // selection in platform-specific implementations, such as
-  // V4L2VideoDecodeAccelerator.
-  base::CPU cpu;
-  bool hw_large_video_support =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kIgnoreResolutionLimitsForAcceleratedVideoDecode) ||
-      ((cpu.vendor_name() == "GenuineIntel") && cpu.model() >= 55);
-  bool os_large_video_support = true;
-#if defined(OS_WIN)
-  os_large_video_support = false;
-#endif
-  return os_large_video_support && hw_large_video_support;
+  }
+  return false;
 }
 
 // Report |status| to UMA and run |cb| with it.  This is super-specific to the
 // UMA stat reported because the UMA_HISTOGRAM_ENUMERATION API requires a
 // callsite to always be called with the same stat name (can't parameterize it).
 static void ReportGpuVideoDecoderInitializeStatusToUMAAndRunCB(
     const PipelineStatusCB& cb,
     PipelineStatus status) {
   UMA_HISTOGRAM_ENUMERATION(
       "Media.GpuVideoDecoderInitializeStatus", status, PIPELINE_STATUS_MAX + 1);
@@ skipping 22 matching lines @@
            << config.AsHumanReadableString();
 
   // TODO(posciak): destroy and create a new VDA on codec/profile change
   // (http://crbug.com/260224).
   if (previously_initialized && (config_.profile() != config.profile())) {
     DVLOG(1) << "Codec or profile changed, cannot reinitialize.";
     status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
     return;
   }
 
-  if (!IsCodedSizeSupported(config.coded_size())) {
+  if (!IsProfileSupported(config.profile(), config.coded_size())) {
     status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
     return;
   }
 
   config_ = config;
   needs_bitstream_conversion_ = (config.codec() == kCodecH264);
   output_cb_ = BindToCurrentLoop(output_cb);
 
   if (previously_initialized) {
     // Reinitialization with a different config (but same codec and profile).
@@ skipping 403 matching lines @@
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
   if (!vda_)
     return;
 
   state_ = kError;
 
   DLOG(ERROR) << "VDA Error: " << error;
   DestroyVDA();
 }
 
+bool GpuVideoDecoder::IsProfileSupported(const VideoCodecProfile& profile,
+                                         const gfx::Size& coded_size) {
+  DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
+  bool support_query_profile = false;
+  std::vector<VideoDecodeAccelerator::SupportedProfile> supported_profiles =
+      factories_->GetVideoDecodeAcceleratorSupportedProfiles(
+          &support_query_profile);
+  if (support_query_profile) {
+    for (const auto& supported_profile : supported_profiles) {
+      if (profile == supported_profile.profile &&
+          IsCodedSizeSupported(coded_size,
+                               supported_profile.min_resolution,
+                               supported_profile.max_resolution)) {

[wuchengli, 2015/03/18 08:02:38]

Can you check with Pawel if max_resolution indicates coded size or visible size?
Thanks.

+        return true;
+      }
+    }
+  } else {
+#if defined(OS_WIN)
+    // Windows Media Foundation H.264 decoding does not support decoding videos
+    // with any dimension smaller than 48 pixels:
+    // http://msdn.microsoft.com/en-us/library/windows/desktop/dd797815
+    // Use 1088 to account for 16x16 macroblocks.
+    return IsCodedSizeSupported(
+        coded_size, gfx::Size(48, 48), gfx::Size(1920, 1088));
+#else
+    return IsCodedSizeSupported(
+        coded_size, gfx::Size(16, 16), gfx::Size(1920, 1088));
+#endif
+  }
+  return false;
+}
+
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media