summaryrefslogtreecommitdiffstats
path: root/content/common/gpu/media
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-17 15:48:57 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-17 15:48:57 +0000
commit02122678b815da528afdbe05b10a6d412281fcbc (patch)
tree46958093577bcab22053d9b4ec74b4f67fab60ff /content/common/gpu/media
parent1a4c21cc5dfa7847173e945baea2e90aeab13eac (diff)
downloadchromium_src-02122678b815da528afdbe05b10a6d412281fcbc.zip
chromium_src-02122678b815da528afdbe05b10a6d412281fcbc.tar.gz
chromium_src-02122678b815da528afdbe05b10a6d412281fcbc.tar.bz2
Forcibly disable MacVDA, even for users who ignore the GPU blacklist.
BUG=125424,133828,157394,160090 Review URL: https://chromiumcodereview.appspot.com/11415036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/media')
-rw-r--r--content/common/gpu/media/mac_video_decode_accelerator.mm6
1 files changed, 6 insertions, 0 deletions
diff --git a/content/common/gpu/media/mac_video_decode_accelerator.mm b/content/common/gpu/media/mac_video_decode_accelerator.mm
index 0f64ffb..ed8f2e6 100644
--- a/content/common/gpu/media/mac_video_decode_accelerator.mm
+++ b/content/common/gpu/media/mac_video_decode_accelerator.mm
@@ -104,6 +104,12 @@ MacVideoDecodeAccelerator::MacVideoDecodeAccelerator(
bool MacVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile) {
DCHECK(CalledOnValidThread());
+ // MacVDA still fails on too many videos to be useful, even to users who
+ // ignore the GPU blacklist. Fail unconditionally here until enough of
+ // crbug.com/133828's blockers are resolved.
+ if (true)
+ return false;
+
if (profile < media::H264PROFILE_MIN || profile > media::H264PROFILE_MAX)
return false;