Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: content/browser/android/media_player_manager_impl.cc

Issue 17022008: Pass InitializeCDM() call through IPC to the browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
Index: content/browser/android/media_player_manager_impl.cc
diff --git a/content/browser/android/media_player_manager_impl.cc b/content/browser/android/media_player_manager_impl.cc
index 93c355a8a4a99a7956751bb6a5baa92208014feb..ae404e8a4f0b38a65f8fecb83bb79af3b804fd04 100644
--- a/content/browser/android/media_player_manager_impl.cc
+++ b/content/browser/android/media_player_manager_impl.cc
@@ -75,6 +75,8 @@ bool MediaPlayerManagerImpl::OnMessageReceived(const IPC::Message& msg) {
OnDurationChanged)
IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaSeekRequestAck,
OnMediaSeekRequestAck)
+ IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_InitializeCDM,
+ OnInitializeCDM)
IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_GenerateKeyRequest,
OnGenerateKeyRequest)
IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_AddKey, OnAddKey)
@@ -435,11 +437,15 @@ void MediaPlayerManagerImpl::OnMediaSeekRequestAck(
player->OnSeekRequestAck(seek_request_id);
}
+void MediaPlayerManagerImpl::OnInitializeCDM(int media_keys_id,
+ const std::vector<uint8>& uuid) {
+ // TODO(qinmin/xhwang): Create a MediaDrmBridge.
+}
+
void MediaPlayerManagerImpl::OnGenerateKeyRequest(
int media_keys_id,
const std::string& type,
const std::vector<uint8>& init_data) {
- // TODO(qinmin): add a new MediaDrmBridge if GetDrmBridge() returns NULL.
MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
if (drm_bridge) {
drm_bridge->GenerateKeyRequest(type, &init_data[0], init_data.size());

Powered by Google App Engine
This is Rietveld 408576698