| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/renderer/media/chrome_key_systems.h" | 5 #include "chrome/renderer/media/chrome_key_systems.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 break; | 146 break; |
| 147 } | 147 } |
| 148 } | 148 } |
| 149 } | 149 } |
| 150 | 150 |
| 151 static void AddPepperBasedWidevine( | 151 static void AddPepperBasedWidevine( |
| 152 std::vector<KeySystemInfo>* concrete_key_systems) { | 152 std::vector<KeySystemInfo>* concrete_key_systems) { |
| 153 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) | 153 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) |
| 154 Version glibc_version(gnu_get_libc_version()); | 154 Version glibc_version(gnu_get_libc_version()); |
| 155 DCHECK(glibc_version.IsValid()); | 155 DCHECK(glibc_version.IsValid()); |
| 156 if (glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION)) | 156 if (glibc_version < base::Version(WIDEVINE_CDM_MIN_GLIBC_VERSION)) |
| 157 return; | 157 return; |
| 158 #endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) | 158 #endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) |
| 159 | 159 |
| 160 std::vector<base::string16> additional_param_names; | 160 std::vector<base::string16> additional_param_names; |
| 161 std::vector<base::string16> additional_param_values; | 161 std::vector<base::string16> additional_param_values; |
| 162 if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType, | 162 if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType, |
| 163 &additional_param_names, | 163 &additional_param_names, |
| 164 &additional_param_values)) { | 164 &additional_param_values)) { |
| 165 DVLOG(1) << "Widevine CDM is not currently available."; | 165 DVLOG(1) << "Widevine CDM is not currently available."; |
| 166 return; | 166 return; |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 224 |
| 225 #if defined(WIDEVINE_CDM_AVAILABLE) | 225 #if defined(WIDEVINE_CDM_AVAILABLE) |
| 226 AddPepperBasedWidevine(key_systems_info); | 226 AddPepperBasedWidevine(key_systems_info); |
| 227 #endif // defined(WIDEVINE_CDM_AVAILABLE) | 227 #endif // defined(WIDEVINE_CDM_AVAILABLE) |
| 228 #endif // defined(ENABLE_PEPPER_CDMS) | 228 #endif // defined(ENABLE_PEPPER_CDMS) |
| 229 | 229 |
| 230 #if defined(OS_ANDROID) | 230 #if defined(OS_ANDROID) |
| 231 cdm::AddAndroidWidevine(key_systems_info); | 231 cdm::AddAndroidWidevine(key_systems_info); |
| 232 #endif // defined(OS_ANDROID) | 232 #endif // defined(OS_ANDROID) |
| 233 } | 233 } |
| OLD | NEW |