| Index: media/base/key_systems.cc
|
| diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
|
| index 25676ba46bbc54debca30122d734707cf7231573..c2eb7f163076d82dd03b7ff2ca3255f7f9103e32 100644
|
| --- a/media/base/key_systems.cc
|
| +++ b/media/base/key_systems.cc
|
| @@ -86,16 +86,6 @@ class ClearKeyProperties : public KeySystemProperties {
|
| // VP9 support is device dependent.
|
| SupportedCodecs codecs = EME_CODEC_WEBM_ALL;
|
|
|
| -#if defined(OS_ANDROID)
|
| - // Temporarily disable VP9 support for Android.
|
| - // TODO(xhwang): Use mime_util.h to query VP9 support on Android.
|
| - codecs &= ~EME_CODEC_WEBM_VP9;
|
| -
|
| - // Opus is not supported on Android yet. http://crbug.com/318436.
|
| - // TODO(sandersd): Check for platform support to set this bit.
|
| - codecs &= ~EME_CODEC_WEBM_OPUS;
|
| -#endif // defined(OS_ANDROID)
|
| -
|
| #if defined(USE_PROPRIETARY_CODECS)
|
| codecs |= EME_CODEC_MP4_ALL;
|
| #endif // defined(USE_PROPRIETARY_CODECS)
|
|
|