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

Unified Diff: webkit/media/crypto/key_systems_info.h

Issue 15028015: Conditionally build support for Pepper-based CDMs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use AppendAscii() where possible. Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/crypto/key_systems.cc ('k') | webkit/media/crypto/key_systems_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/key_systems_info.h
diff --git a/webkit/media/crypto/key_systems_info.h b/webkit/media/crypto/key_systems_info.h
index f02abafd6a549ed4178cf33420faf8fbb68a0d11..e94aad76a5a0e74e8e4416ffafef82f75496d4a0 100644
--- a/webkit/media/crypto/key_systems_info.h
+++ b/webkit/media/crypto/key_systems_info.h
@@ -15,10 +15,12 @@ struct MediaFormatAndKeySystem {
const char* key_system;
};
-struct KeySystemPluginTypePair {
+#if defined(ENABLE_PEPPER_CDMS)
+struct KeySystemPepperTypePair {
const char* key_system;
- const char* plugin_type;
+ const char* type;
};
+#endif
// Specifies the container and codec combinations supported by individual
// key systems. Each line is a container-codecs combination and the key system
@@ -29,9 +31,11 @@ struct KeySystemPluginTypePair {
extern const MediaFormatAndKeySystem kSupportedFormatKeySystemCombinations[];
extern const int kNumSupportedFormatKeySystemCombinations;
+#if defined(ENABLE_PEPPER_CDMS)
// There should be one entry for each key system.
-extern const KeySystemPluginTypePair kKeySystemToPluginTypeMapping[];
-extern const int kNumKeySystemToPluginTypeMapping;
+extern const KeySystemPepperTypePair kKeySystemToPepperTypeMapping[];
+extern const int kNumKeySystemToPepperTypeMapping;
+#endif
// Returns whether |key_system| is compatible with the user's system.
bool IsSystemCompatible(const std::string& key_system);
« no previous file with comments | « webkit/media/crypto/key_systems.cc ('k') | webkit/media/crypto/key_systems_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698