chrome/renderer/media/chrome_key_systems.cc - Issue 230843004: Reland r262568 "Encrypted Media: Check container mime type in MediaDrmBridge".

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 230843004: Reland r262568 "Encrypted Media: Check container mime type in MediaDrmBridge". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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

« no previous file with comments | « chrome/browser/media/encrypted_media_message_filter_android.cc ('k') | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d0a9b58e2de9045f6492aa857c5fc95d32c6d6a5..276c63cba73fb59965fa8ebc81db3930b2ac2167 100644

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

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

@@ -292,10 +292,8 @@ static void AddAndroidWidevine(

SupportedKeySystemResponse response;

request.key_system = kWidevineKeySystem;

-#if defined(USE_PROPRIETARY_CODECS)

request.codecs = static_cast<android::SupportedCodecs>(

- android::MP4_AAC | android::MP4_AVC1);

-#endif // defined(USE_PROPRIETARY_CODECS)

+ android::WEBM_VP8_AND_VORBIS | android::MP4_AAC | android::MP4_AVC1);

content::RenderThread::Get()->Send(

new ChromeViewHostMsg_GetSupportedKeySystems(request, &response));

DCHECK_EQ(response.compositing_codecs >> 3, 0) << "unrecognized codec";