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

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

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix isRenewalMessage() in browser tests. Created 4 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
« no previous file with comments | « media/base/android/media_drm_bridge.h ('k') | media/base/key_systems.h » ('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
24 // * Parent key system 26 // * Parent key system
25 // A key system string that is one level up from the child key system. It may 27 // A key system string that is one level up from the child key system. It may
26 // be an abstract key system. 28 // be an abstract key system.
27 // As an example, "com.example" is the parent of "com.example.foo". 29 // As an example, "com.example" is the parent of "com.example.foo".
28 30
29 namespace media { 31 namespace media {
30 32
31 // Contains information about an EME key system as well as how to instantiate 33 // Contains information about an EME key system as well as how to instantiate
32 // the corresponding CDM. 34 // the corresponding CDM.
33 struct MEDIA_EXPORT KeySystemInfo { 35 struct MEDIA_EXPORT KeySystemInfo {
(...skipping 24 matching lines...) Expand all
58 // The following indicate how the corresponding CDM should be instantiated. 60 // The following indicate how the corresponding CDM should be instantiated.
59 bool use_aes_decryptor = false; 61 bool use_aes_decryptor = false;
60 #if defined(ENABLE_PEPPER_CDMS) 62 #if defined(ENABLE_PEPPER_CDMS)
61 std::string pepper_type; 63 std::string pepper_type;
62 #endif 64 #endif
63 }; 65 };
64 66
65 } // namespace media 67 } // namespace media
66 68
67 #endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_ 69 #endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_
OLDNEW
« no previous file with comments | « media/base/android/media_drm_bridge.h ('k') | media/base/key_systems.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698