Index: content/common/gpu/media/android_video_decode_accelerator.cc |
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc |
index 58078831cc8380d13d7bc9fbd720b1de754cc715..5e9d8f3e478d48f6057686d82afaa046f3e9ec4f 100644 |
--- a/content/common/gpu/media/android_video_decode_accelerator.cc |
+++ b/content/common/gpu/media/android_video_decode_accelerator.cc |
@@ -22,6 +22,7 @@ |
#include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
#include "gpu/command_buffer/service/gpu_switches.h" |
#include "gpu/command_buffer/service/mailbox_manager.h" |
+#include "media/base/android/media_codec_util.h" |
#include "media/base/bind_to_current_loop.h" |
#include "media/base/bitstream_buffer.h" |
#include "media/base/limits.h" |
@@ -992,10 +993,12 @@ AndroidVideoDecodeAccelerator::GetCapabilities() { |
SupportedProfile profile; |
- profile.profile = media::VP8PROFILE_ANY; |
- profile.min_resolution.SetSize(0, 0); |
- profile.max_resolution.SetSize(1920, 1088); |
- profiles.push_back(profile); |
+ if (!media::MediaCodecUtil::IsVp8Blacklisted()) { |
+ profile.profile = media::VP8PROFILE_ANY; |
+ profile.min_resolution.SetSize(0, 0); |
+ profile.max_resolution.SetSize(1920, 1088); |
+ profiles.push_back(profile); |
+ } |
profile.profile = media::VP9PROFILE_ANY; |
profile.min_resolution.SetSize(0, 0); |