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

Side by Side Diff: content/browser/media/android/media_web_contents_observer_android.cc

Issue 1570043002: Implement MediaSession on top of the WebMediaPlayerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session
Patch Set: Reorder. 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/browser/media/android/media_web_contents_observer_android.h" 5 #include "content/browser/media/android/media_web_contents_observer_android.h"
6 6
7 #include "content/browser/media/android/browser_media_player_manager.h" 7 #include "content/browser/media/android/browser_media_player_manager.h"
8 #include "content/browser/media/android/browser_media_session_manager.h" 8 #include "content/browser/media/android/browser_media_session_manager.h"
9 #include "content/browser/media/android/media_session.h"
10 #include "content/browser/media/android/media_session_controller.h"
9 #include "content/browser/media/android/media_session_observer.h" 11 #include "content/browser/media/android/media_session_observer.h"
10 #include "content/browser/media/cdm/browser_cdm_manager.h" 12 #include "content/browser/media/cdm/browser_cdm_manager.h"
11 #include "content/browser/web_contents/web_contents_impl.h" 13 #include "content/browser/web_contents/web_contents_impl.h"
14 #include "content/common/media/media_player_delegate_messages.h"
12 #include "content/common/media/media_player_messages_android.h" 15 #include "content/common/media/media_player_messages_android.h"
13 #include "content/common/media/media_session_messages_android.h" 16 #include "content/common/media/media_session_messages_android.h"
14 #include "content/public/browser/render_frame_host.h" 17 #include "content/public/browser/render_frame_host.h"
15 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
16 #include "ipc/ipc_message_macros.h" 19 #include "ipc/ipc_message_macros.h"
17 #include "media/base/android/media_player_android.h" 20 #include "media/base/android/media_player_android.h"
18 21
19 namespace content { 22 namespace content {
20 23
21 MediaWebContentsObserverAndroid::MediaWebContentsObserverAndroid( 24 MediaWebContentsObserverAndroid::MediaWebContentsObserverAndroid(
(...skipping 29 matching lines...) Expand all
51 auto it = media_session_managers_.find(render_frame_host); 54 auto it = media_session_managers_.find(render_frame_host);
52 if (it != media_session_managers_.end()) 55 if (it != media_session_managers_.end())
53 return it->second; 56 return it->second;
54 57
55 BrowserMediaSessionManager* manager = 58 BrowserMediaSessionManager* manager =
56 new BrowserMediaSessionManager(render_frame_host); 59 new BrowserMediaSessionManager(render_frame_host);
57 media_session_managers_.set(render_frame_host, make_scoped_ptr(manager)); 60 media_session_managers_.set(render_frame_host, make_scoped_ptr(manager));
58 return manager; 61 return manager;
59 } 62 }
60 63
64 bool MediaWebContentsObserverAndroid::RequestPlay(
65 RenderFrameHost* render_frame_host,
66 int delegate_id,
67 bool has_audio,
68 bool is_remote,
69 base::TimeDelta duration) {
70 // |has_video| forced to true since the value doesn't matter at present.
71 OnMediaPlaying(render_frame_host, delegate_id, true, has_audio, is_remote,
72 duration);
73 return media_session_map_.find(MediaPlayerId(
74 render_frame_host, delegate_id)) != media_session_map_.end();
75 }
76
61 #if defined(VIDEO_HOLE) 77 #if defined(VIDEO_HOLE)
62 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() { 78 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() {
63 for (auto it = media_player_managers_.begin(); 79 for (auto it = media_player_managers_.begin();
64 it != media_player_managers_.end(); ++it) { 80 it != media_player_managers_.end(); ++it) {
65 it->second->OnFrameInfoUpdated(); 81 it->second->OnFrameInfoUpdated();
66 } 82 }
67 } 83 }
68 #endif // defined(VIDEO_HOLE) 84 #endif // defined(VIDEO_HOLE)
69 85
70 void MediaWebContentsObserverAndroid::RenderFrameDeleted( 86 void MediaWebContentsObserverAndroid::RenderFrameDeleted(
71 RenderFrameHost* render_frame_host) { 87 RenderFrameHost* render_frame_host) {
72 MediaWebContentsObserver::RenderFrameDeleted(render_frame_host); 88 MediaWebContentsObserver::RenderFrameDeleted(render_frame_host);
73 89
90 for (auto it = media_session_map_.begin(); it != media_session_map_.end();) {
91 if (it->first.first == render_frame_host)
92 it = media_session_map_.erase(it);
93 else
94 ++it;
95 }
96
74 // Always destroy the media players before CDMs because we do not support 97 // Always destroy the media players before CDMs because we do not support
75 // detaching CDMs from media players yet. See http://crbug.com/330324 98 // detaching CDMs from media players yet. See http://crbug.com/330324
76 media_player_managers_.erase(render_frame_host); 99 media_player_managers_.erase(render_frame_host);
77 media_session_managers_.erase(render_frame_host); 100 media_session_managers_.erase(render_frame_host);
78 101
79 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager 102 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
80 // and BrowserCdmManager all run on browser UI thread. So this call is okay. 103 // and BrowserCdmManager all run on browser UI thread. So this call is okay.
81 // In the future we need to support the case where MediaWebContentsObserver 104 // In the future we need to support the case where MediaWebContentsObserver
82 // get notified on browser UI thread, but BrowserMediaPlayerManager and 105 // get notified on browser UI thread, but BrowserMediaPlayerManager and
83 // BrowserCdmManager run on a different thread. 106 // BrowserCdmManager run on a different thread.
84 BrowserCdmManager* browser_cdm_manager = 107 BrowserCdmManager* browser_cdm_manager =
85 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID()); 108 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID());
86 if (browser_cdm_manager) 109 if (browser_cdm_manager)
87 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID()); 110 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());
88 } 111 }
89 112
90 bool MediaWebContentsObserverAndroid::OnMessageReceived( 113 bool MediaWebContentsObserverAndroid::OnMessageReceived(
91 const IPC::Message& msg, 114 const IPC::Message& msg,
92 RenderFrameHost* render_frame_host) { 115 RenderFrameHost* render_frame_host) {
116 // Receive play/pause/destroyed messages, but don't mark as processed so they
117 // are also handled by MediaWebContentsObserver.
118 OnMediaPlayerDelegateMessageReceived(msg, render_frame_host);
119
93 if (MediaWebContentsObserver::OnMessageReceived(msg, render_frame_host)) 120 if (MediaWebContentsObserver::OnMessageReceived(msg, render_frame_host))
94 return true; 121 return true;
95 122
96 if (OnMediaPlayerMessageReceived(msg, render_frame_host)) 123 if (OnMediaPlayerMessageReceived(msg, render_frame_host))
97 return true; 124 return true;
98 125
99 if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host)) 126 if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host))
100 return true; 127 return true;
101 128
102 if (OnMediaSessionMessageReceived(msg, render_frame_host)) 129 if (OnMediaSessionMessageReceived(msg, render_frame_host))
103 return true; 130 return true;
104 131
105 return false; 132 return false;
106 } 133 }
107 134
135 void MediaWebContentsObserverAndroid::OnMediaPlayerDelegateMessageReceived(
136 const IPC::Message& msg,
137 RenderFrameHost* render_frame_host) {
138 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(MediaWebContentsObserverAndroid, msg,
139 render_frame_host)
140 IPC_MESSAGE_HANDLER(MediaPlayerDelegateHostMsg_OnMediaDestroyed,
141 OnMediaDestroyed)
142 IPC_MESSAGE_HANDLER(MediaPlayerDelegateHostMsg_OnMediaPaused, OnMediaPaused)
143 IPC_MESSAGE_HANDLER(MediaPlayerDelegateHostMsg_OnMediaPlaying,
144 OnMediaPlaying)
145 IPC_END_MESSAGE_MAP()
146 }
147
108 bool MediaWebContentsObserverAndroid::OnMediaPlayerMessageReceived( 148 bool MediaWebContentsObserverAndroid::OnMediaPlayerMessageReceived(
109 const IPC::Message& msg, 149 const IPC::Message& msg,
110 RenderFrameHost* render_frame_host) { 150 RenderFrameHost* render_frame_host) {
111 bool handled = true; 151 bool handled = true;
112 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserverAndroid, msg) 152 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserverAndroid, msg)
113 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen, 153 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen,
114 GetMediaPlayerManager(render_frame_host), 154 GetMediaPlayerManager(render_frame_host),
115 BrowserMediaPlayerManager::OnEnterFullscreen) 155 BrowserMediaPlayerManager::OnEnterFullscreen)
116 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Initialize, 156 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Initialize,
117 GetMediaPlayerManager(render_frame_host), 157 GetMediaPlayerManager(render_frame_host),
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 if (!cdm) { 251 if (!cdm) {
212 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; 252 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id;
213 return; 253 return;
214 } 254 }
215 255
216 // TODO(xhwang): This could possibly fail. In that case we should reject the 256 // TODO(xhwang): This could possibly fail. In that case we should reject the
217 // promise. 257 // promise.
218 media_player->SetCdm(cdm); 258 media_player->SetCdm(cdm);
219 } 259 }
220 260
261 void MediaWebContentsObserverAndroid::OnMediaDestroyed(
262 RenderFrameHost* render_frame_host,
263 int delegate_id) {
264 media_session_map_.erase(MediaPlayerId(render_frame_host, delegate_id));
265 }
266
267 void MediaWebContentsObserverAndroid::OnMediaPaused(
268 RenderFrameHost* render_frame_host,
269 int delegate_id,
270 bool reached_end_of_stream) {
271 // Drop the session if playback completes normally.
272 if (reached_end_of_stream) {
273 OnMediaDestroyed(render_frame_host, delegate_id);
274 return;
275 }
276
277 auto it =
278 media_session_map_.find(MediaPlayerId(render_frame_host, delegate_id));
279 if (it == media_session_map_.end())
280 return;
281
282 it->second->OnPlaybackPaused();
283 }
284
285 void MediaWebContentsObserverAndroid::OnMediaPlaying(
286 RenderFrameHost* render_frame_host,
287 int delegate_id,
288 bool has_video,
289 bool has_audio,
290 bool is_remote,
291 base::TimeDelta duration) {
292 const MediaPlayerId id(render_frame_host, delegate_id);
293
294 // Since we don't remove session instances on pause, there may be an existing
295 // instance for this playback attempt.
296 //
297 // In this case, try to reinitialize it with the new settings. If they are
298 // the same, this is a no-op. If the reinitialize fails, destroy the
299 // controller. A later playback attempt will create a new controller.
300 auto it = media_session_map_.find(id);
301 if (it != media_session_map_.end()) {
302 if (!it->second->Initialize(has_audio, is_remote, duration))
303 media_session_map_.erase(it);
304 return;
305 }
306
307 scoped_ptr<MediaSessionController> controller(
308 new MediaSessionController(id, this));
309
310 if (!controller->Initialize(has_audio, is_remote, duration))
311 return;
312
313 media_session_map_[id] = std::move(controller);
314 }
315
221 } // namespace content 316 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698