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

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

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unittest. Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_EME_CONSTANTS_H_ 5 #ifndef MEDIA_BASE_EME_CONSTANTS_H_
6 #define MEDIA_BASE_EME_CONSTANTS_H_ 6 #define MEDIA_BASE_EME_CONSTANTS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 namespace media { 10 namespace media {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // The configuration option prevents use of persistent state. 125 // The configuration option prevents use of persistent state.
126 PERSISTENCE_NOT_ALLOWED, 126 PERSISTENCE_NOT_ALLOWED,
127 // The configuration option is supported if persistent state is available. 127 // The configuration option is supported if persistent state is available.
128 PERSISTENCE_REQUIRED, 128 PERSISTENCE_REQUIRED,
129 // The configuration option is supported if both a distinctive identifier and 129 // The configuration option is supported if both a distinctive identifier and
130 // persistent state are available. 130 // persistent state are available.
131 IDENTIFIER_AND_PERSISTENCE_REQUIRED, 131 IDENTIFIER_AND_PERSISTENCE_REQUIRED,
132 // The configuration option prevents use of hardware-secure codecs. 132 // The configuration option prevents use of hardware-secure codecs.
133 // This rule only has meaning on platforms that distinguish hardware-secure 133 // This rule only has meaning on platforms that distinguish hardware-secure
134 // codecs (ie. Android). 134 // codecs (ie. Android).
135 SECURE_CODECS_NOT_ALLOWED, 135 HW_SECURE_CODECS_NOT_ALLOWED,
136 // The configuration option is supported if hardware-secure codecs are used. 136 // The configuration option is supported if hardware-secure codecs are used.
137 // This rule only has meaning on platforms that distinguish hardware-secure 137 // This rule only has meaning on platforms that distinguish hardware-secure
138 // codecs (ie. Android). 138 // codecs (ie. Android).
139 SECURE_CODECS_REQUIRED, 139 HW_SECURE_CODECS_REQUIRED,
140 // The configuration option is supported without conditions. 140 // The configuration option is supported without conditions.
141 SUPPORTED, 141 SUPPORTED,
142 }; 142 };
143 143
144 } // namespace media 144 } // namespace media
145 145
146 #endif // MEDIA_BASE_EME_CONSTANTS_H_ 146 #endif // MEDIA_BASE_EME_CONSTANTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698