| 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 <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 if (!IsPepperCdmAvailable(kExternalClearKeyPepperType, | 69 if (!IsPepperCdmAvailable(kExternalClearKeyPepperType, |
| 70 &additional_param_names, | 70 &additional_param_names, |
| 71 &additional_param_values)) { | 71 &additional_param_values)) { |
| 72 return; | 72 return; |
| 73 } | 73 } |
| 74 | 74 |
| 75 KeySystemInfo info; | 75 KeySystemInfo info; |
| 76 info.key_system = kExternalClearKeyKeySystem; | 76 info.key_system = kExternalClearKeyKeySystem; |
| 77 | 77 |
| 78 info.supported_codecs = media::EME_CODEC_WEBM_ALL; | 78 info.supported_codecs = media::EME_CODEC_WEBM_ALL; |
| 79 info.supported_init_data_types = media::EME_INIT_DATA_TYPE_WEBM; | 79 info.supported_init_data_types = |
| 80 media::EME_INIT_DATA_TYPE_WEBM | media::EME_INIT_DATA_TYPE_KEYIDS; |
| 80 #if defined(USE_PROPRIETARY_CODECS) | 81 #if defined(USE_PROPRIETARY_CODECS) |
| 81 info.supported_codecs |= media::EME_CODEC_MP4_ALL; | 82 info.supported_codecs |= media::EME_CODEC_MP4_ALL; |
| 82 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; | 83 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; |
| 83 #endif // defined(USE_PROPRIETARY_CODECS) | 84 #endif // defined(USE_PROPRIETARY_CODECS) |
| 84 | 85 |
| 85 // Persistent sessions are faked. | 86 // Persistent sessions are faked. |
| 86 info.persistent_license_support = media::EME_SESSION_TYPE_SUPPORTED; | 87 info.persistent_license_support = media::EME_SESSION_TYPE_SUPPORTED; |
| 87 info.persistent_release_message_support = | 88 info.persistent_release_message_support = |
| 88 media::EME_SESSION_TYPE_NOT_SUPPORTED; | 89 media::EME_SESSION_TYPE_NOT_SUPPORTED; |
| 89 // TODO(sandersd): Using ALWAYS_ENABLED prevents "not-allowed" from | 90 // TODO(sandersd): Using ALWAYS_ENABLED prevents "not-allowed" from |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 | 223 |
| 223 #if defined(WIDEVINE_CDM_AVAILABLE) | 224 #if defined(WIDEVINE_CDM_AVAILABLE) |
| 224 AddPepperBasedWidevine(key_systems_info); | 225 AddPepperBasedWidevine(key_systems_info); |
| 225 #endif // defined(WIDEVINE_CDM_AVAILABLE) | 226 #endif // defined(WIDEVINE_CDM_AVAILABLE) |
| 226 #endif // defined(ENABLE_PEPPER_CDMS) | 227 #endif // defined(ENABLE_PEPPER_CDMS) |
| 227 | 228 |
| 228 #if defined(OS_ANDROID) | 229 #if defined(OS_ANDROID) |
| 229 cdm::AddAndroidWidevine(key_systems_info); | 230 cdm::AddAndroidWidevine(key_systems_info); |
| 230 #endif // defined(OS_ANDROID) | 231 #endif // defined(OS_ANDROID) |
| 231 } | 232 } |
| OLD | NEW |