| OLD | NEW |
| 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_SYSTEMS_H_ | 5 #ifndef MEDIA_BASE_KEY_SYSTEMS_H_ |
| 6 #define MEDIA_BASE_KEY_SYSTEMS_H_ | 6 #define MEDIA_BASE_KEY_SYSTEMS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 | 110 |
| 111 #if defined(ENABLE_PEPPER_CDMS) | 111 #if defined(ENABLE_PEPPER_CDMS) |
| 112 // Returns the Pepper MIME type for |concrete_key_system|. | 112 // Returns the Pepper MIME type for |concrete_key_system|. |
| 113 // Returns empty string if |concrete_key_system| is unknown or not Pepper-based. | 113 // Returns empty string if |concrete_key_system| is unknown or not Pepper-based. |
| 114 MEDIA_EXPORT std::string GetPepperType( | 114 MEDIA_EXPORT std::string GetPepperType( |
| 115 const std::string& concrete_key_system); | 115 const std::string& concrete_key_system); |
| 116 #endif | 116 #endif |
| 117 | 117 |
| 118 #if defined(UNIT_TEST) | 118 #if defined(UNIT_TEST) |
| 119 // Helper functions to add container/codec types for testing purposes. | 119 // Helper functions to add container/codec types for testing purposes. |
| 120 MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32 mask); | 120 MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32_t mask); |
| 121 MEDIA_EXPORT void AddCodecMask( | 121 MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type, |
| 122 EmeMediaType media_type, | 122 const std::string& codec, |
| 123 const std::string& codec, | 123 uint32_t mask); |
| 124 uint32 mask); | |
| 125 #endif // defined(UNIT_TEST) | 124 #endif // defined(UNIT_TEST) |
| 126 | 125 |
| 127 } // namespace media | 126 } // namespace media |
| 128 | 127 |
| 129 #endif // MEDIA_BASE_KEY_SYSTEMS_H_ | 128 #endif // MEDIA_BASE_KEY_SYSTEMS_H_ |
| OLD | NEW |