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

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

Issue 748473002: Introduce CdmContext interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@set_cdm
Patch Set: Created 6 years, 1 month 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
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 "content/common/media/media_player_messages_android.h" 7 #include "content/common/media/media_player_messages_android.h"
8 #include "content/public/common/renderer_preferences.h" 8 #include "content/public/common/renderer_preferences.h"
9 #include "content/renderer/media/android/renderer_media_player_manager.h" 9 #include "content/renderer/media/android/renderer_media_player_manager.h"
10 #include "content/renderer/media/android/webmediaplayer_android.h" 10 #include "content/renderer/media/android/webmediaplayer_android.h"
11 #include "content/renderer/media/crypto/renderer_cdm_manager.h" 11 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
12 #include "content/renderer/render_view_impl.h" 12 #include "content/renderer/render_view_impl.h"
13 #include "media/base/cdm_context.h"
13 #include "ui/gfx/rect_f.h" 14 #include "ui/gfx/rect_f.h"
14 15
15 namespace content { 16 namespace content {
16 17
17 RendererMediaPlayerManager::RendererMediaPlayerManager( 18 RendererMediaPlayerManager::RendererMediaPlayerManager(
18 RenderFrame* render_frame) 19 RenderFrame* render_frame)
19 : RenderFrameObserver(render_frame), 20 : RenderFrameObserver(render_frame),
20 next_media_player_id_(0) { 21 next_media_player_id_(0) {
21 } 22 }
22 23
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 242
242 void RendererMediaPlayerManager::EnterFullscreen(int player_id) { 243 void RendererMediaPlayerManager::EnterFullscreen(int player_id) {
243 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id)); 244 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
244 } 245 }
245 246
246 void RendererMediaPlayerManager::ExitFullscreen(int player_id) { 247 void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
247 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); 248 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
248 } 249 }
249 250
250 void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) { 251 void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) {
251 if (cdm_id == media::MediaKeys::kInvalidCdmId) { 252 if (cdm_id == media::CdmContext::kInvalidCdmId) {
252 NOTREACHED(); 253 NOTREACHED();
253 return; 254 return;
254 } 255 }
255 Send(new MediaPlayerHostMsg_SetCdm(routing_id(), player_id, cdm_id)); 256 Send(new MediaPlayerHostMsg_SetCdm(routing_id(), player_id, cdm_id));
256 } 257 }
257 258
258 int RendererMediaPlayerManager::RegisterMediaPlayer( 259 int RendererMediaPlayerManager::RegisterMediaPlayer(
259 WebMediaPlayerAndroid* player) { 260 WebMediaPlayerAndroid* player) {
260 media_players_[next_media_player_id_] = player; 261 media_players_[next_media_player_id_] = player;
261 return next_media_player_id_++; 262 return next_media_player_id_++;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 324
324 bool 325 bool
325 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { 326 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() {
326 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( 327 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>(
327 render_frame())->render_view()->renderer_preferences(); 328 render_frame())->render_view()->renderer_preferences();
328 return prefs.use_video_overlay_for_embedded_encrypted_video; 329 return prefs.use_video_overlay_for_embedded_encrypted_video;
329 } 330 }
330 #endif // defined(VIDEO_HOLE) 331 #endif // defined(VIDEO_HOLE)
331 332
332 } // namespace content 333 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | media/blink/cdm_session_adapter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698