content/renderer/media/crypto/encrypted_media_player_support_impl.h - Issue 594713002: Pass initial CDM to CreateMediaPlayer()

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: content/renderer/media/crypto/encrypted_media_player_support_impl.h

Issue 594713002: Pass initial CDM to CreateMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixes for android + mojo 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

« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/crypto/encrypted_media_player_support_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/crypto/encrypted_media_player_support_impl.h

diff --git a/content/renderer/media/crypto/encrypted_media_player_support_impl.h b/content/renderer/media/crypto/encrypted_media_player_support_impl.h

index f0299d84d09f8e0cdd347e0da5728934b92cfc9c..788747f48d245a3e5f662aca6e04d18e6c9b32f1 100644

--- a/content/renderer/media/crypto/encrypted_media_player_support_impl.h

+++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.h

@@ -48,13 +48,14 @@ class EncryptedMediaPlayerSupportImpl

const blink::WebString& key_system,

const blink::WebString& session_id) OVERRIDE;

+ virtual void SetInitialContentDecryptionModule(

+ blink::WebContentDecryptionModule* initial_cdm) OVERRIDE;

virtual void SetContentDecryptionModule(

blink::WebContentDecryptionModule* cdm) OVERRIDE;

virtual void SetContentDecryptionModule(

blink::WebContentDecryptionModule* cdm,

blink::WebContentDecryptionModuleResult result) OVERRIDE;

- virtual void SetContentDecryptionModuleSync(

- blink::WebContentDecryptionModule* cdm) OVERRIDE;

virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() OVERRIDE;

virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() OVERRIDE;