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"
 #include "base/command_line.h"
-#include "base/cpu.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task_runner_util.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
-#include "media/base/media_switches.h"
 #include "media/base/pipeline.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_decoder_config.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace media {
 
 const char GpuVideoDecoder::kDecoderName[] = "GpuVideoDecoder";
 
@@ skipping 59 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)
-    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 =
-      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;
-}
-
 // 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);
   cb.Run(status);
 }
@@ skipping 20 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())) {

[wuchengli, 2014/12/19 03:35:18]

Combine IsCodedSizeSupported and IsProfileSupported to IsConfigSupported(const
VideoDecoderConfig& config) here should be better. The loop is the same. Also,
we should not assign config_ = config before IsProfileSupported passes.

     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).
     // VDA should handle it by detecting this in-stream by itself,
     // no need to notify it.
     status_cb.Run(PIPELINE_OK);
     return;
   }
 
+  if (!IsProfileSupported(config.profile())) {
+    status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
+    return;
+  }
+
   vda_ = factories_->CreateVideoDecodeAccelerator().Pass();
   if (!vda_ || !vda_->Initialize(config.profile(), this)) {
     status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);

[wuchengli, 2014/12/19 03:35:18]

PIPELINE_ERROR_INITIALIZATION_FAILED? Please find which error code makes the
most sense given not supported should be ruled out by IsCodedSizeSupported and
IsProfileSupported.

     return;
   }
 
   DVLOG(3) << "GpuVideoDecoder::Initialize() succeeded.";
   status_cb.Run(PIPELINE_OK);
 }
 
 void GpuVideoDecoder::DestroyPictureBuffers(PictureBufferMap* buffers) {
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
   for (PictureBufferMap::iterator it = buffers->begin(); it != buffers->end();
@@ skipping 416 matching lines @@
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
   if (!vda_)
     return;
 
   state_ = kError;
 
   DLOG(ERROR) << "VDA Error: " << error;
   DestroyVDA();
 }
 
+bool GpuVideoDecoder::IsCodedSizeSupported(const gfx::Size& coded_size) {
+  DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
+  std::vector<VideoDecodeAccelerator::SupportedProfile> supported_profiles =
+      factories_->GetVideoDecodeAcceleratorSupportedProfiles();
+  for (size_t i = 0; i < supported_profiles.size(); i++) {

[wuchengli, 2014/12/19 03:35:18]

You have to check the corresponding profile. You cannot return true on a
mismatched profile.

+    if (coded_size.width() <= supported_profiles[i].max_resolution.width() &&
+        coded_size.height() <= supported_profiles[i].max_resolution.height() &&
+        coded_size.width() >= supported_profiles[i].min_resolution.width() &&
+        coded_size.height() >= supported_profiles[i].min_resolution.height()) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool GpuVideoDecoder::IsProfileSupported(const VideoCodecProfile& profile) {
+  DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
+  std::vector<VideoDecodeAccelerator::SupportedProfile> supported_profiles =
+      factories_->GetVideoDecodeAcceleratorSupportedProfiles();
+  for (size_t i = 0; i < supported_profiles.size(); i++) {
+    if (profile == supported_profiles[i].profile)
+      return true;
+  }
+  return false;
+}
+
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media