content/renderer/media/webmediaplayer_proxy_impl_android.h - Issue 17289006: Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

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/webmediaplayer_proxy_impl_android.h

Issue 17289006: Separate CDM initialization from GenerateKeyRequest & remove key_system parameters. (Closed) Base URL: master

Patch Set: rebase only Created 7 years, 6 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/common/media/media_player_messages_android.h ('k') | content/renderer/media/webmediaplayer_proxy_impl_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webmediaplayer_proxy_impl_android.h

diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.h b/content/renderer/media/webmediaplayer_proxy_impl_android.h

index 5f4f2d6ac6e527b8cbc4ffb667c9566829276c65..0864bf770cfa7dcb47bca7c2fb11aa5bc4943ea1 100644

--- a/content/renderer/media/webmediaplayer_proxy_impl_android.h

+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.h

@@ -55,16 +55,13 @@ class WebMediaPlayerProxyImplAndroid

int player_id,

const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params&) OVERRIDE;

virtual void GenerateKeyRequest(int player_id,

- const std::string& key_system,

const std::string& type,

const std::vector<uint8>& init_data) OVERRIDE;

virtual void AddKey(int player_id,

- const std::string& key_system,

const std::vector<uint8>& key,

const std::vector<uint8>& init_data,

const std::string& session_id) OVERRIDE;

virtual void CancelKeyRequest(int player_id,

- const std::string& key_system,

const std::string& session_id) OVERRIDE;

virtual void DurationChanged(int player_id,

const base::TimeDelta& duration) OVERRIDE;

@@ -100,15 +97,12 @@ class WebMediaPlayerProxyImplAndroid

unsigned seek_request_id);

void OnMediaConfigRequest(int player_id);

void OnKeyAdded(int player_id,

- const std::string& key_system,

const std::string& session_id);

void OnKeyError(int player_id,

- const std::string& key_system,

const std::string& session_id,

media::MediaKeys::KeyError error_code,

int system_code);

void OnKeyMessage(int player_id,

- const std::string& key_system,

const std::string& session_id,

const std::string& message,

const std::string& destination_url);