chrome/renderer/media/chrome_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: chrome/renderer/media/chrome_key_systems.cc

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

Patch Set: Fix #endif comment. 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

Index: chrome/renderer/media/chrome_key_systems.cc

diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc

index c15d493bb2bcf6497f5572318285c0d7b3e04999..e23e360e99ea2ffb838de9780eda8338ac3b56da 100644

--- a/chrome/renderer/media/chrome_key_systems.cc

+++ b/chrome/renderer/media/chrome_key_systems.cc

@@ -13,6 +13,7 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/common/render_messages.h"

#include "components/cdm/renderer/widevine_key_systems.h"

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

#include "content/public/renderer/render_thread.h"

#if defined(OS_ANDROID)

@@ -74,8 +75,10 @@ static void AddExternalClearKey(

KeySystemInfo info(kExternalClearKeyKeySystem);

info.supported_codecs = content::EME_CODEC_WEBM_ALL;

+ info.supported_init_data_types = content::EME_INIT_DATA_TYPE_WEBM;

#if defined(USE_PROPRIETARY_CODECS)

info.supported_codecs |= content::EME_CODEC_MP4_ALL;

+ info.supported_init_data_types |= content::EME_INIT_DATA_TYPE_CENC;

#endif // defined(USE_PROPRIETARY_CODECS)

info.pepper_type = kExternalClearKeyPepperType;

« no previous file with comments | « no previous file | components/cdm/common/cdm_messages_android.h » ('j') | content/renderer/media/crypto/key_systems.h » ('J')