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

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

Issue 1732423002: EME: Remove the concept of a parent key system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ks
Patch Set: Add test per review. Created 4 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 | « components/cdm/renderer/widevine_key_systems.cc ('k') | media/base/key_systems.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 "build/build_config.h" 10 #include "build/build_config.h"
11 #include "media/base/eme_constants.h" 11 #include "media/base/eme_constants.h"
12 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
13 13
14 // Definitions: 14 // Definitions:
15 // * Key system 15 // * Key system
16 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypt ed-media.html#key-system 16 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypt ed-media.html#key-system
17 // * Concrete key system 17 // * Concrete key system
18 // A key system string that can be instantiated, such as 18 // A key system string that can be instantiated, such as
19 // via the MediaKeys constructor. Examples include "org.w3.clearkey" and 19 // via the MediaKeys constructor. Examples include "org.w3.clearkey" and
20 // "com.widevine.alpha". 20 // "com.widevine.alpha".
21 // * Abstract key system 21 // * Abstract key system
22 // A key system string that cannot be instantiated like a concrete key system 22 // A key system string that cannot be instantiated like a concrete key system
23 // but is otherwise useful, such as in discovery using isTypeSupported(). 23 // but is otherwise useful, such as in discovery using isTypeSupported().
24 // TODO(ddorwin): Remove the concept of a parent key system now that prefixed
25 // has been removed. https://crbug.com/249976
26 // * Parent key system
27 // A key system string that is one level up from the child key system. It may
28 // be an abstract key system.
29 // As an example, "com.example" is the parent of "com.example.foo".
30 24
31 namespace media { 25 namespace media {
32 26
33 // Contains information about an EME key system as well as how to instantiate 27 // Contains information about an EME key system as well as how to instantiate
34 // the corresponding CDM. 28 // the corresponding CDM.
35 struct MEDIA_EXPORT KeySystemInfo { 29 struct MEDIA_EXPORT KeySystemInfo {
36 KeySystemInfo(); 30 KeySystemInfo();
37 ~KeySystemInfo(); 31 ~KeySystemInfo();
38 32
39 std::string key_system; 33 std::string key_system;
40 34
41 InitDataTypeMask supported_init_data_types = kInitDataTypeMaskNone; 35 InitDataTypeMask supported_init_data_types = kInitDataTypeMaskNone;
42 SupportedCodecs supported_codecs = EME_CODEC_NONE; 36 SupportedCodecs supported_codecs = EME_CODEC_NONE;
43 #if defined(OS_ANDROID) 37 #if defined(OS_ANDROID)
44 SupportedCodecs supported_secure_codecs = EME_CODEC_NONE; 38 SupportedCodecs supported_secure_codecs = EME_CODEC_NONE;
45 #endif // defined(OS_ANDROID) 39 #endif // defined(OS_ANDROID)
46 EmeRobustness max_audio_robustness = EmeRobustness::INVALID; 40 EmeRobustness max_audio_robustness = EmeRobustness::INVALID;
47 EmeRobustness max_video_robustness = EmeRobustness::INVALID; 41 EmeRobustness max_video_robustness = EmeRobustness::INVALID;
48 EmeSessionTypeSupport persistent_license_support = 42 EmeSessionTypeSupport persistent_license_support =
49 EmeSessionTypeSupport::INVALID; 43 EmeSessionTypeSupport::INVALID;
50 EmeSessionTypeSupport persistent_release_message_support = 44 EmeSessionTypeSupport persistent_release_message_support =
51 EmeSessionTypeSupport::INVALID; 45 EmeSessionTypeSupport::INVALID;
52 EmeFeatureSupport persistent_state_support = EmeFeatureSupport::INVALID; 46 EmeFeatureSupport persistent_state_support = EmeFeatureSupport::INVALID;
53 EmeFeatureSupport distinctive_identifier_support = EmeFeatureSupport::INVALID; 47 EmeFeatureSupport distinctive_identifier_support = EmeFeatureSupport::INVALID;
54 48
55 // A hierarchical parent for |key_system|. This value can be used to check
56 // supported types but cannot be used to instantiate a MediaKeys object.
57 // Only one parent key system is currently supported per concrete key system.
58 std::string parent_key_system;
59
60 // The following indicate how the corresponding CDM should be instantiated. 49 // The following indicate how the corresponding CDM should be instantiated.
61 bool use_aes_decryptor = false; 50 bool use_aes_decryptor = false;
62 #if defined(ENABLE_PEPPER_CDMS) 51 #if defined(ENABLE_PEPPER_CDMS)
63 std::string pepper_type; 52 std::string pepper_type;
64 #endif 53 #endif
65 }; 54 };
66 55
67 } // namespace media 56 } // namespace media
68 57
69 #endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_ 58 #endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_
OLDNEW
« no previous file with comments | « components/cdm/renderer/widevine_key_systems.cc ('k') | media/base/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698