GVD: Disable 4k HW decode for VPX formats for Intel platforms.

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) {
+static bool IsCodedSizeSupported(const gfx::Size& coded_size,
+                                 VideoCodecProfile profile) {
 #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 =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kIgnoreResolutionLimitsForAcceleratedVideoDecode) ||
-      ((cpu.vendor_name() == "GenuineIntel") && cpu.model() >= 55);
+      ((cpu.vendor_name() == "GenuineIntel") && cpu.model() >= 55 &&
+       // TODO(posciak, henryhsu): Remove this once we can query in runtime.
+       profile >= H264PROFILE_MIN && profile <= H264PROFILE_MAX);
   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).
@@ skipping 27 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 (!IsCodedSizeSupported(config.coded_size(), config.profile())) {
     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 409 matching lines @@
   DLOG(ERROR) << "VDA Error: " << error;
   DestroyVDA();
 }
 
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media