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

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

Issue 1027363002: Change EmeInitDataType to be an enum class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 9 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
« no previous file with comments | « media/base/eme_constants.h ('k') | media/base/key_system_info.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17 matching lines...) Expand all
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(); 33 KeySystemInfo();
34 ~KeySystemInfo(); 34 ~KeySystemInfo();
35 35
36 std::string key_system; 36 std::string key_system;
37 37
38 SupportedInitDataTypes supported_init_data_types; 38 InitDataTypeMask supported_init_data_types;
39 SupportedCodecs supported_codecs; 39 SupportedCodecs supported_codecs;
40 EmeRobustness max_audio_robustness; 40 EmeRobustness max_audio_robustness;
41 EmeRobustness max_video_robustness; 41 EmeRobustness max_video_robustness;
42 EmeSessionTypeSupport persistent_license_support; 42 EmeSessionTypeSupport persistent_license_support;
43 EmeSessionTypeSupport persistent_release_message_support; 43 EmeSessionTypeSupport persistent_release_message_support;
44 EmeFeatureSupport persistent_state_support; 44 EmeFeatureSupport persistent_state_support;
45 EmeFeatureSupport distinctive_identifier_support; 45 EmeFeatureSupport distinctive_identifier_support;
46 46
47 // A hierarchical parent for |key_system|. This value can be used to check 47 // A hierarchical parent for |key_system|. This value can be used to check
48 // supported types but cannot be used to instantiate a MediaKeys object. 48 // supported types but cannot be used to instantiate a MediaKeys object.
49 // Only one parent key system is currently supported per concrete key system. 49 // Only one parent key system is currently supported per concrete key system.
50 std::string parent_key_system; 50 std::string parent_key_system;
51 51
52 // The following indicate how the corresponding CDM should be instantiated. 52 // The following indicate how the corresponding CDM should be instantiated.
53 bool use_aes_decryptor; 53 bool use_aes_decryptor;
54 #if defined(ENABLE_PEPPER_CDMS) 54 #if defined(ENABLE_PEPPER_CDMS)
55 std::string pepper_type; 55 std::string pepper_type;
56 #endif 56 #endif
57 }; 57 };
58 58
59 } // namespace media 59 } // namespace media
60 60
61 #endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_ 61 #endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_
OLDNEW
« no previous file with comments | « media/base/eme_constants.h ('k') | media/base/key_system_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698