diff options
| author | jrummell <jrummell@chromium.org> | 2015-03-25 18:11:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-26 01:11:51 +0000 |
| commit | dba51339487183810b6c21387f873d5b483cfab1 (patch) | |
| tree | 6ba3eb1ca95286f87b1e6bb6821431abe6fc8fc4 /components/cdm | |
| parent | 7fbd4963fddcac58bf29762d85e96b42562e5c64 (diff) | |
| download | chromium_src-dba51339487183810b6c21387f873d5b483cfab1.zip chromium_src-dba51339487183810b6c21387f873d5b483cfab1.tar.gz chromium_src-dba51339487183810b6c21387f873d5b483cfab1.tar.bz2 | |
Change EmeInitDataType to be an enum class
Mask values are seperated out into consts of type
SupportedInitDataTypes. Also removes unused function
IsSaneInitDataTypeWithContainer().
BUG=417440
TEST=EME layout tests pass
Review URL: https://codereview.chromium.org/1027363002
Cr-Commit-Position: refs/heads/master@{#322286}
Diffstat (limited to 'components/cdm')
| -rw-r--r-- | components/cdm/renderer/android_key_systems.cc | 4 | ||||
| -rw-r--r-- | components/cdm/renderer/widevine_key_systems.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/cdm/renderer/android_key_systems.cc b/components/cdm/renderer/android_key_systems.cc index e773656..d9bb106 100644 --- a/components/cdm/renderer/android_key_systems.cc +++ b/components/cdm/renderer/android_key_systems.cc @@ -107,10 +107,10 @@ void AddAndroidPlatformKeySystems( // associated initialization data type. KeySystems handles validating // |init_data_type| x |container| pairings. if (response.compositing_codecs & media::EME_CODEC_WEBM_ALL) - info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM; + info.supported_init_data_types |= media::kInitDataTypeMaskWebM; #if defined(USE_PROPRIETARY_CODECS) if (response.compositing_codecs & media::EME_CODEC_MP4_ALL) - info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; + info.supported_init_data_types |= media::kInitDataTypeMaskCenc; #endif // defined(USE_PROPRIETARY_CODECS) info.max_audio_robustness = EmeRobustness::EMPTY; info.max_video_robustness = EmeRobustness::EMPTY; diff --git a/components/cdm/renderer/widevine_key_systems.cc b/components/cdm/renderer/widevine_key_systems.cc index ec38ab6..c1412c3 100644 --- a/components/cdm/renderer/widevine_key_systems.cc +++ b/components/cdm/renderer/widevine_key_systems.cc @@ -62,10 +62,10 @@ void AddWidevineWithCodecs( // associated initialization data type. KeySystems handles validating // |init_data_type| x |container| pairings. if (supported_codecs & media::EME_CODEC_WEBM_ALL) - info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM; + info.supported_init_data_types |= media::kInitDataTypeMaskWebM; #if defined(USE_PROPRIETARY_CODECS) if (supported_codecs & media::EME_CODEC_MP4_ALL) - info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; + info.supported_init_data_types |= media::kInitDataTypeMaskCenc; #endif // defined(USE_PROPRIETARY_CODECS) info.max_audio_robustness = max_audio_robustness; |