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

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

Issue 1570043002: Implement MediaSession on top of the WebMediaPlayerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session
Patch Set: Merge. Cleanup. Fix RequestPlay. Created 4 years, 11 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
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/command_line.h" 7 #include "base/command_line.h"
8 #include "content/common/media/media_player_messages_android.h" 8 #include "content/common/media/media_player_messages_android.h"
9 #include "content/public/common/renderer_preferences.h" 9 #include "content/public/common/renderer_preferences.h"
10 #include "content/renderer/media/android/webmediaplayer_android.h" 10 #include "content/renderer/media/android/webmediaplayer_android.h"
11 #include "content/renderer/media/cdm/renderer_cdm_manager.h" 11 #include "content/renderer/media/cdm/renderer_cdm_manager.h"
12 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
12 #include "content/renderer/render_view_impl.h" 13 #include "content/renderer/render_view_impl.h"
13 #include "media/base/cdm_context.h" 14 #include "media/base/cdm_context.h"
14 #include "media/base/media_switches.h" 15 #include "media/base/media_switches.h"
15 #include "ui/gfx/geometry/rect_f.h" 16 #include "ui/gfx/geometry/rect_f.h"
16 17
17 namespace content { 18 namespace content {
18 19
19 RendererMediaPlayerManager::RendererMediaPlayerManager( 20 RendererMediaPlayerManager::RendererMediaPlayerManager(
20 RenderFrame* render_frame) 21 RenderFrame* render_frame)
21 : RenderFrameObserver(render_frame), 22 : RenderFrameObserver(render_frame),
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 const GURL& frame_url, 87 const GURL& frame_url,
87 bool allow_credentials) { 88 bool allow_credentials) {
88 MediaPlayerHostMsg_Initialize_Params media_player_params; 89 MediaPlayerHostMsg_Initialize_Params media_player_params;
89 media_player_params.type = type; 90 media_player_params.type = type;
90 media_player_params.player_id = player_id; 91 media_player_params.player_id = player_id;
91 media_player_params.demuxer_client_id = demuxer_client_id; 92 media_player_params.demuxer_client_id = demuxer_client_id;
92 media_player_params.url = url; 93 media_player_params.url = url;
93 media_player_params.first_party_for_cookies = first_party_for_cookies; 94 media_player_params.first_party_for_cookies = first_party_for_cookies;
94 media_player_params.frame_url = frame_url; 95 media_player_params.frame_url = frame_url;
95 media_player_params.allow_credentials = allow_credentials; 96 media_player_params.allow_credentials = allow_credentials;
97 media_player_params.delegate_id =
98 media::RendererWebMediaPlayerDelegate::GetPlayerId(
99 media_players_[player_id]);
96 100
97 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); 101 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params));
98 } 102 }
99 103
100 void RendererMediaPlayerManager::Start(int player_id) { 104 void RendererMediaPlayerManager::Start(int player_id) {
101 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id)); 105 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id));
102 } 106 }
103 107
104 void RendererMediaPlayerManager::Pause( 108 void RendererMediaPlayerManager::Pause(
105 int player_id, 109 int player_id,
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 325
322 bool 326 bool
323 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { 327 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() {
324 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( 328 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>(
325 render_frame())->render_view()->renderer_preferences(); 329 render_frame())->render_view()->renderer_preferences();
326 return prefs.use_video_overlay_for_embedded_encrypted_video; 330 return prefs.use_video_overlay_for_embedded_encrypted_video;
327 } 331 }
328 #endif // defined(VIDEO_HOLE) 332 #endif // defined(VIDEO_HOLE)
329 333
330 } // namespace content 334 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698