diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 20:57:36 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 20:57:36 +0000 |
| commit | d60323f9d74d6144ce56f77960fcfa3d77a014b3 (patch) | |
| tree | 721df1e91e18f1fa393d46a5aec5ef4b90e301be /webkit/media | |
| parent | 5a15944557b69146ffc54bde0456f9b915f2ff3c (diff) | |
| download | chromium_src-d60323f9d74d6144ce56f77960fcfa3d77a014b3.zip chromium_src-d60323f9d74d6144ce56f77960fcfa3d77a014b3.tar.gz chromium_src-d60323f9d74d6144ce56f77960fcfa3d77a014b3.tar.bz2 | |
Check glibc version for kWidevineBaseKeySystem as well.
BUG=230530,224767
TEST=Unit tests pass when required glibc version cannot be found.
Review URL: https://codereview.chromium.org/14018019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/crypto/key_systems_info.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/media/crypto/key_systems_info.cc b/webkit/media/crypto/key_systems_info.cc index 9b6c8d3..2eee9bd 100644 --- a/webkit/media/crypto/key_systems_info.cc +++ b/webkit/media/crypto/key_systems_info.cc @@ -22,8 +22,10 @@ static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey"; static const char kExternalClearKeyKeySystem[] = "org.chromium.externalclearkey"; +#if defined(WIDEVINE_CDM_AVAILABLE) // TODO(ddorwin): Automatically support parent systems: http://crbug.com/164303. static const char kWidevineBaseKeySystem[] = "com.widevine"; +#endif // defined(WIDEVINE_CDM_AVAILABLE) #if defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE) // The supported codecs depend on what the CDM provides. @@ -96,7 +98,8 @@ const int kNumKeySystemToPluginTypeMapping = bool IsSystemCompatible(const std::string& key_system) { #if defined(WIDEVINE_CDM_AVAILABLE) && \ defined(OS_LINUX) && !defined(OS_CHROMEOS) - if (key_system == kWidevineKeySystem) { + if (key_system == kWidevineKeySystem || + key_system == kWidevineBaseKeySystem) { Version glibc_version(gnu_get_libc_version()); DCHECK(glibc_version.IsValid()); return !glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION); |