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

Side by Side Diff: content/renderer/media/android/renderer_media_player_manager.cc

Issue 193523002: Encrypted Media: Implement IPC based SetCdm(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/android/renderer_media_player_manager.h" 5 #include "content/renderer/media/android/renderer_media_player_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/common/media/cdm_messages.h" 9 #include "content/common/media/cdm_messages.h"
10 #include "content/common/media/media_player_messages_android.h" 10 #include "content/common/media/media_player_messages_android.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 blink::WebFrame* frame) { 232 blink::WebFrame* frame) {
233 pending_fullscreen_frame_ = frame; 233 pending_fullscreen_frame_ = frame;
234 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id)); 234 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
235 } 235 }
236 236
237 void RendererMediaPlayerManager::ExitFullscreen(int player_id) { 237 void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
238 pending_fullscreen_frame_ = NULL; 238 pending_fullscreen_frame_ = NULL;
239 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); 239 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
240 } 240 }
241 241
242 void RendererMediaPlayerManager::SetMediaKeys(int player_id, int cdm_id) {
243 Send(new MediaPlayerHostMsg_SetMediaKeys(routing_id(), player_id, cdm_id));
244 }
245
242 void RendererMediaPlayerManager::InitializeCdm(int cdm_id, 246 void RendererMediaPlayerManager::InitializeCdm(int cdm_id,
243 ProxyMediaKeys* media_keys, 247 ProxyMediaKeys* media_keys,
244 const std::string& key_system, 248 const std::string& key_system,
245 const GURL& frame_url) { 249 const GURL& frame_url) {
246 RegisterMediaKeys(cdm_id, media_keys); 250 RegisterMediaKeys(cdm_id, media_keys);
247 Send(new CdmHostMsg_InitializeCdm( 251 Send(new CdmHostMsg_InitializeCdm(
248 routing_id(), cdm_id, key_system, frame_url)); 252 routing_id(), cdm_id, key_system, frame_url));
249 } 253 }
250 254
251 void RendererMediaPlayerManager::CreateSession( 255 void RendererMediaPlayerManager::CreateSession(
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 431
428 if (player && player->hasVideo()) { 432 if (player && player->hasVideo()) {
429 if (player->UpdateBoundaryRectangle()) 433 if (player->UpdateBoundaryRectangle())
430 (*changes)[player_it->first] = player->GetBoundaryRectangle(); 434 (*changes)[player_it->first] = player->GetBoundaryRectangle();
431 } 435 }
432 } 436 }
433 } 437 }
434 #endif // defined(VIDEO_HOLE) 438 #endif // defined(VIDEO_HOLE)
435 439
436 } // namespace content 440 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698