diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 04:22:07 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 04:22:07 +0000 |
| commit | 9f49ee58801844b4f7b9604992843d0c0f537638 (patch) | |
| tree | bb8f25867515ba93071213aa77816d954be6ae6a /webkit/media | |
| parent | ad1a1b7eab86f4d8b0117f6c9b041537ff5af072 (diff) | |
| download | chromium_src-9f49ee58801844b4f7b9604992843d0c0f537638.zip chromium_src-9f49ee58801844b4f7b9604992843d0c0f537638.tar.gz chromium_src-9f49ee58801844b4f7b9604992843d0c0f537638.tar.bz2 | |
Temporarily disable canPlayType() and tests for component CDM.
BUG=180260,237627,237636
Review URL: https://chromiumcodereview.appspot.com/14835003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/crypto/key_systems_info.cc | 5 | ||||
| -rw-r--r-- | webkit/media/crypto/key_systems_unittest.cc | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/webkit/media/crypto/key_systems_info.cc b/webkit/media/crypto/key_systems_info.cc index 2eee9bd..8fc2c42 100644 --- a/webkit/media/crypto/key_systems_info.cc +++ b/webkit/media/crypto/key_systems_info.cc @@ -66,6 +66,10 @@ const MediaFormatAndKeySystem kSupportedFormatKeySystemCombinations[] = { #if defined(WIDEVINE_CDM_AVAILABLE) // Widevine. + // See http://crbug.com/237627. +#if defined(DISABLE_WIDEVINE_CDM_CANPLAYTYPE) + { "", "", kWidevineKeySystem }, +#else { "video/webm", "vorbis,vp8,vp8.0", kWidevineKeySystem }, { "audio/webm", "vorbis", kWidevineKeySystem }, { "video/webm", "vorbis,vp8,vp8.0", kWidevineBaseKeySystem }, @@ -78,6 +82,7 @@ const MediaFormatAndKeySystem kSupportedFormatKeySystemCombinations[] = { { "audio/mp4", kWidevineAudioMp4Codecs, kWidevineBaseKeySystem }, #endif // defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE) #endif // defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) +#endif // defined(DISABLE_WIDEVINE_CDM_CANPLAYTYPE) #endif // WIDEVINE_CDM_AVAILABLE }; diff --git a/webkit/media/crypto/key_systems_unittest.cc b/webkit/media/crypto/key_systems_unittest.cc index 4b28ec9..da21832 100644 --- a/webkit/media/crypto/key_systems_unittest.cc +++ b/webkit/media/crypto/key_systems_unittest.cc @@ -30,7 +30,12 @@ using WebKit::WebString; #define EXPECT_WV(a) \ EXPECT_EQ((std::string(gnu_get_libc_version()) != "2.11.1"), (a)) #else +// See http://crbug.com/237627. +#if defined(DISABLE_WIDEVINE_CDM_CANPLAYTYPE) +#define EXPECT_WV EXPECT_FALSE +#else #define EXPECT_WV EXPECT_TRUE +#endif // defined(DISABLE_WIDEVINE_CDM_CANPLAYTYPE) #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) #if defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE) |