Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(550)

Side by Side Diff: chrome/renderer/media/chrome_key_systems.cc

Issue 923283002: Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 KeySystemInfo info(kExternalClearKeyKeySystem); 75 KeySystemInfo info(kExternalClearKeyKeySystem);
76 76
77 info.supported_codecs = media::EME_CODEC_WEBM_ALL; 77 info.supported_codecs = media::EME_CODEC_WEBM_ALL;
78 info.supported_init_data_types = media::EME_INIT_DATA_TYPE_WEBM; 78 info.supported_init_data_types = media::EME_INIT_DATA_TYPE_WEBM;
79 #if defined(USE_PROPRIETARY_CODECS) 79 #if defined(USE_PROPRIETARY_CODECS)
80 info.supported_codecs |= media::EME_CODEC_MP4_ALL; 80 info.supported_codecs |= media::EME_CODEC_MP4_ALL;
81 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; 81 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
82 #endif // defined(USE_PROPRIETARY_CODECS) 82 #endif // defined(USE_PROPRIETARY_CODECS)
83 83
84 // Persistent sessions are faked.
85 info.persistent_state_requirement = media::EME_REQUIREMENT_OPTIONAL;
86 info.distinctive_identifier_requirement = media::EME_REQUIREMENT_NOT_ALLOWED;
87 info.supported_session_types = media::EME_SESSION_TYPE_TEMPORARY |
88 media::EME_SESSION_TYPE_PERSISTENT_LICENSE;
89
84 info.pepper_type = kExternalClearKeyPepperType; 90 info.pepper_type = kExternalClearKeyPepperType;
85 91
86 concrete_key_systems->push_back(info); 92 concrete_key_systems->push_back(info);
87 93
88 // Add support of decrypt-only mode in ClearKeyCdm. 94 // Add support of decrypt-only mode in ClearKeyCdm.
89 info.key_system = kExternalClearKeyDecryptOnlyKeySystem; 95 info.key_system = kExternalClearKeyDecryptOnlyKeySystem;
90 concrete_key_systems->push_back(info); 96 concrete_key_systems->push_back(info);
91 97
92 // A key system that triggers FileIO test in ClearKeyCdm. 98 // A key system that triggers FileIO test in ClearKeyCdm.
93 info.key_system = kExternalClearKeyFileIOTestKeySystem; 99 info.key_system = kExternalClearKeyFileIOTestKeySystem;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 197
192 #if defined(WIDEVINE_CDM_AVAILABLE) 198 #if defined(WIDEVINE_CDM_AVAILABLE)
193 AddPepperBasedWidevine(key_systems_info); 199 AddPepperBasedWidevine(key_systems_info);
194 #endif // defined(WIDEVINE_CDM_AVAILABLE) 200 #endif // defined(WIDEVINE_CDM_AVAILABLE)
195 #endif // defined(ENABLE_PEPPER_CDMS) 201 #endif // defined(ENABLE_PEPPER_CDMS)
196 202
197 #if defined(OS_ANDROID) 203 #if defined(OS_ANDROID)
198 cdm::AddAndroidWidevine(key_systems_info); 204 cdm::AddAndroidWidevine(key_systems_info);
199 #endif // defined(OS_ANDROID) 205 #endif // defined(OS_ANDROID)
200 } 206 }
OLDNEW
« no previous file with comments | « no previous file | components/cdm/renderer/android_key_systems.cc » ('j') | components/cdm/renderer/android_key_systems.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698