components/cdm/renderer/android_key_systems.cc - Issue 1027363002: Change EmeInitDataType to be an enum class

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/cdm/renderer/android_key_systems.cc

Issue 1027363002: Change EmeInitDataType to be an enum class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 9 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:

Index: components/cdm/renderer/android_key_systems.cc

diff --git a/components/cdm/renderer/android_key_systems.cc b/components/cdm/renderer/android_key_systems.cc

index e77365653183eebf6f442e2e11f75290568b6335..d9bb106bc2cc8736cbfbd9024bfe440e54e143c9 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;