diff options
| author | jrummell <jrummell@chromium.org> | 2015-04-21 15:28:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-21 22:28:58 +0000 |
| commit | 01db4c8321aee76ce432561ef492fecb833a6363 (patch) | |
| tree | 5932b9fbd192f4ac093a071de9e3e63bdca90700 /chromecast | |
| parent | 0044897feca3e12b01ea0f50939b5a5eb33c6046 (diff) | |
| download | chromium_src-01db4c8321aee76ce432561ef492fecb833a6363.zip chromium_src-01db4c8321aee76ce432561ef492fecb833a6363.tar.gz chromium_src-01db4c8321aee76ce432561ef492fecb833a6363.tar.bz2 | |
Change enums in eme_constants.h to enum classes
BUG=473830
TEST=media_unittests pass
Review URL: https://codereview.chromium.org/1093253002
Cr-Commit-Position: refs/heads/master@{#326147}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/renderer/key_systems_cast.cc | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/chromecast/renderer/key_systems_cast.cc b/chromecast/renderer/key_systems_cast.cc index 5d3ad1c..c9cae76 100644 --- a/chromecast/renderer/key_systems_cast.cc +++ b/chromecast/renderer/key_systems_cast.cc @@ -27,11 +27,13 @@ void AddKeySystemWithCodecs( ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1; info.max_audio_robustness = ::media::EmeRobustness::EMPTY; info.max_video_robustness = ::media::EmeRobustness::EMPTY; - info.persistent_license_support = ::media::EME_SESSION_TYPE_NOT_SUPPORTED; + info.persistent_license_support = + ::media::EmeSessionTypeSupport::NOT_SUPPORTED; info.persistent_release_message_support = - ::media::EME_SESSION_TYPE_NOT_SUPPORTED; - info.persistent_state_support = ::media::EME_FEATURE_ALWAYS_ENABLED; - info.distinctive_identifier_support = ::media::EME_FEATURE_ALWAYS_ENABLED; + ::media::EmeSessionTypeSupport::NOT_SUPPORTED; + info.persistent_state_support = ::media::EmeFeatureSupport::ALWAYS_ENABLED; + info.distinctive_identifier_support = + ::media::EmeFeatureSupport::ALWAYS_ENABLED; key_systems_info->push_back(info); } @@ -39,15 +41,16 @@ void AddChromecastKeySystems( std::vector<::media::KeySystemInfo>* key_systems_info) { #if defined(WIDEVINE_CDM_AVAILABLE) AddWidevineWithCodecs( - cdm::WIDEVINE, - ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1, - ::media::EmeRobustness::HW_SECURE_ALL, // Max audio robustness. - ::media::EmeRobustness::HW_SECURE_ALL, // Max video robustness. - ::media::EME_SESSION_TYPE_NOT_SUPPORTED, // persistent-license. - ::media::EME_SESSION_TYPE_NOT_SUPPORTED, // persistent-release-message. + cdm::WIDEVINE, ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1, + ::media::EmeRobustness::HW_SECURE_ALL, // Max audio robustness. + ::media::EmeRobustness::HW_SECURE_ALL, // Max video robustness. + ::media::EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license. + ::media::EmeSessionTypeSupport:: + NOT_SUPPORTED, // persistent-release-message. // Note: On Chromecast, all CDMs may have persistent state. - ::media::EME_FEATURE_ALWAYS_ENABLED, // Persistent state. - ::media::EME_FEATURE_ALWAYS_ENABLED, // Distinctive identifier. + ::media::EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state. + ::media::EmeFeatureSupport::ALWAYS_ENABLED, // Distinctive + // identifier. key_systems_info); #endif |