components/cdm/renderer/widevine_key_systems.cc - Issue 557723003: Implement Chromium side of MediaKeys.isTypeSupported().

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/widevine_key_systems.cc

Issue 557723003: Implement Chromium side of MediaKeys.isTypeSupported(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Requested changes. Created 6 years, 3 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:

View side-by-side diff with in-line comments

Download patch

« components/cdm/renderer/android_key_systems.cc ('K') | « components/cdm/renderer/android_key_systems.cc ('k') | content/content_common.gypi » ('j') | content/public/common/eme_constants.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cdm/renderer/widevine_key_systems.cc

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

index 2a41322112eac5fac5e2dd64a7c46eff29705304..37cb19b3efc5234159059ac371a10389e903c79c 100644

--- a/components/cdm/renderer/widevine_key_systems.cc

+++ b/components/cdm/renderer/widevine_key_systems.cc

@@ -8,6 +8,7 @@

#include <vector>

#include "base/logging.h"

+#include "content/public/common/eme_constants.h"

#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.

@@ -49,6 +50,15 @@ void AddWidevineWithCodecs(WidevineCdmType widevine_cdm_type,

// initDataType.

info.supported_codecs = supported_codecs;

ddorwin 2014/09/23 22:48:15 ditto.

ddorwin 2014/09/23 22:48:15 // Support for a container implies support for the

sandersd (OOO until July 31) 2014/09/24 22:22:33 Done.

+ info.supported_init_data_types = content::EME_INIT_DATA_TYPE_NONE;

ddorwin 2014/09/23 22:48:15 The constructor should handle this.

sandersd (OOO until July 31) 2014/09/24 22:22:33 Done.

+ if (supported_codecs & content::EME_CODEC_WEBM_ALL)

+ info.supported_init_data_types |= content::EME_INIT_DATA_TYPE_WEBM;

+#if defined(USE_PROPRIETARY_CODECS)

+ if (supported_codecs & content::EME_CODEC_MP4_ALL)

+ info.supported_init_data_types |= content::EME_INIT_DATA_TYPE_CENC;

+#endif // defined(USE_PROPRIETARY_CODECS)

#if defined(ENABLE_PEPPER_CDMS)

info.pepper_type = kWidevineCdmPluginMimeType;

#endif // defined(ENABLE_PEPPER_CDMS)