diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 00:03:51 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 00:03:51 +0000 |
| commit | e90b52da219b438647a373c62f22207df809848c (patch) | |
| tree | 78eb5be06ff52e27fc2bfa7470040fd2332ae244 /content/renderer/media/crypto | |
| parent | d0adb95ef4798b3c37fd1345d51c7bfedad8b7d0 (diff) | |
| download | chromium_src-e90b52da219b438647a373c62f22207df809848c.zip chromium_src-e90b52da219b438647a373c62f22207df809848c.tar.gz chromium_src-e90b52da219b438647a373c62f22207df809848c.tar.bz2 | |
Add widevine_cdm_version.h to gyp for android.
- EME API works on Chrome build.
- CanPlayType() is suppressed (returns "") by default.
- User can choose to override the CanPlayType() suppression with a flag
"--override-encrypted-media-canplaytype".
- For Android "video/mp4" is supported, while "video/webm" isn't.
BUG=163552
TEST=Tested all scenarios listed above.
R=ddorwin@chromium.org
Review URL: https://codereview.chromium.org/23975003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/crypto')
| -rw-r--r-- | content/renderer/media/crypto/key_systems_info.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/media/crypto/key_systems_info.cc b/content/renderer/media/crypto/key_systems_info.cc index 495fe05..f0205af 100644 --- a/content/renderer/media/crypto/key_systems_info.cc +++ b/content/renderer/media/crypto/key_systems_info.cc @@ -77,8 +77,10 @@ static void RegisterWidevine() { kWidevineUuid, #endif // defined(ENABLE_PEPPER_CDMS) "com.widevine"); +#if !defined(OS_ANDROID) AddSupportedType(kWidevineKeySystem, "video/webm", "vorbis,vp8,vp8.0"); AddSupportedType(kWidevineKeySystem, "audio/webm", "vorbis"); +#endif // !defined(OS_ANDROID) #if defined(USE_PROPRIETARY_CODECS) && \ defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE) AddSupportedType(kWidevineKeySystem, "video/mp4", kWidevineVideoMp4Codecs); |