Chromium Code Reviews| Index: media/base/key_systems.h |
| diff --git a/media/base/key_systems.h b/media/base/key_systems.h |
| index 93317a118fcd117032cd452da44a54fb40e745ba..79c939f864d3bc3ec172179fc2fbf87aa244e548 100644 |
| --- a/media/base/key_systems.h |
| +++ b/media/base/key_systems.h |
| @@ -85,27 +85,32 @@ MEDIA_EXPORT std::string GetPepperType( |
| const std::string& concrete_key_system); |
| #endif |
| -// Returns whether |key_system| supports persistent-license sessions. |
| -MEDIA_EXPORT bool IsPersistentLicenseSessionSupported( |
| +// Returns whether |key_system| supports the requested robustness level, and |
| +// indicates how support should interacts with the encrypted media permission. |
|
ddorwin
2015/03/13 19:24:47
Fix: "support should interacts"
sandersd (OOO until July 31)
2015/03/13 20:11:57
Done.
|
| +// TODO(sandersd): Also take a list of codecs, as they affect support in some |
|
ddorwin
2015/03/13 19:24:47
...as they may affect the result?
sandersd (OOO until July 31)
2015/03/13 20:11:57
Done.
|
| +// cases. |
| +MEDIA_EXPORT EmeRequirementSupport GetRobustnessRequirementSupport( |
| const std::string& key_system, |
| - bool is_permission_granted); |
| + EmeMediaType media_type, |
| + EmeRobustness robustness); |
| + |
| +// Returns whether |key_system| supports persistent-license sessions. |
| +MEDIA_EXPORT EmeRequirementSupport GetPersistentLicenseSessionSupport( |
| + const std::string& key_system); |
| // Returns whether |key_system| supports persistent-release-message sessions. |
| -MEDIA_EXPORT bool IsPersistentReleaseMessageSessionSupported( |
| - const std::string& key_system, |
| - bool is_permission_granted); |
| +MEDIA_EXPORT EmeRequirementSupport GetPersistentReleaseMessageSessionSupport( |
| + const std::string& key_system); |
| // Returns whether |key_system| supports persistent state as requested. |
| -MEDIA_EXPORT bool IsPersistentStateRequirementSupported( |
| +MEDIA_EXPORT EmeRequirementSupport GetPersistentStateRequirementSupport( |
| const std::string& key_system, |
| - EmeFeatureRequirement requirement, |
| - bool is_permission_granted); |
| + EmeFeatureRequirement requirement); |
| // Returns whether |key_system| supports distinctive identifiers as requested. |
| -MEDIA_EXPORT bool IsDistinctiveIdentifierRequirementSupported( |
| +MEDIA_EXPORT EmeRequirementSupport GetDistinctiveIdentifierRequirementSupport( |
| const std::string& key_system, |
| - EmeFeatureRequirement requirement, |
| - bool is_permission_granted); |
| + EmeFeatureRequirement requirement); |
| #if defined(UNIT_TEST) |
| // Helper functions to add container/codec types for testing purposes. |