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

Side by Side Diff: media/base/key_system_info.h

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 #ifndef MEDIA_BASE_KEY_SYSTEM_INFO_H_ 5 #ifndef MEDIA_BASE_KEY_SYSTEM_INFO_H_
6 #define MEDIA_BASE_KEY_SYSTEM_INFO_H_ 6 #define MEDIA_BASE_KEY_SYSTEM_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "media/base/eme_constants.h" 10 #include "media/base/eme_constants.h"
(...skipping 12 matching lines...) Expand all
23 // * Parent key system 23 // * Parent key system
24 // A key system string that is one level up from the child key system. It may 24 // A key system string that is one level up from the child key system. It may
25 // be an abstract key system. 25 // be an abstract key system.
26 // As an example, "com.example" is the parent of "com.example.foo". 26 // As an example, "com.example" is the parent of "com.example.foo".
27 27
28 namespace media { 28 namespace media {
29 29
30 // Contains information about an EME key system as well as how to instantiate 30 // Contains information about an EME key system as well as how to instantiate
31 // the corresponding CDM. 31 // the corresponding CDM.
32 struct MEDIA_EXPORT KeySystemInfo { 32 struct MEDIA_EXPORT KeySystemInfo {
33 KeySystemInfo();
ddorwin 2015/02/17 20:56:47 Why do we have a default constructor and no longer
sandersd (OOO until July 31) 2015/02/18 23:41:17 The constructor was added so that KeySystemInfo st
33 explicit KeySystemInfo(const std::string& key_system); 34 explicit KeySystemInfo(const std::string& key_system);
34 ~KeySystemInfo();
35 35
36 std::string key_system; 36 std::string key_system;
37 37
38 // Specifies registered initialization data types supported by |key_system|. 38 // Specifies registered initialization data types supported by |key_system|.
39 SupportedInitDataTypes supported_init_data_types; 39 SupportedInitDataTypes supported_init_data_types;
40 40
41 // Specifies codecs supported by |key_system|. 41 // Specifies codecs supported by |key_system|.
42 SupportedCodecs supported_codecs; 42 SupportedCodecs supported_codecs;
43 43
44 // Specifies support for distinctiveIdentifier and persistentState.
45 EmeRequirement persistent_state_requirement;
ddorwin 2015/02/17 20:56:48 Related to earlier: Is it requirement or support?
sandersd (OOO until July 31) 2015/02/18 23:41:17 Acknowledged.
46 EmeRequirement distinctive_identifier_requirement;
47 SupportedSessionTypes supported_session_types;
48
44 // A hierarchical parent for |key_system|. This value can be used to check 49 // A hierarchical parent for |key_system|. This value can be used to check
45 // supported types but cannot be used to instantiate a MediaKeys object. 50 // supported types but cannot be used to instantiate a MediaKeys object.
46 // Only one parent key system is currently supported per concrete key system. 51 // Only one parent key system is currently supported per concrete key system.
47 std::string parent_key_system; 52 std::string parent_key_system;
48 53
49 // The following indicate how the corresponding CDM should be instantiated. 54 // The following indicate how the corresponding CDM should be instantiated.
50 bool use_aes_decryptor; 55 bool use_aes_decryptor;
51 #if defined(ENABLE_PEPPER_CDMS) 56 #if defined(ENABLE_PEPPER_CDMS)
52 std::string pepper_type; 57 std::string pepper_type;
53 #endif 58 #endif
54 }; 59 };
55 60
56 } // namespace media 61 } // namespace media
57 62
58 #endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_ 63 #endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698