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

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

Issue 1698933004: Make MediaSession a runtime-enabled feature on Desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: with flag Created 4 years, 10 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"
11 #include "content/browser/media/android/media_session_observer.h"
12 #include "content/browser/media/cdm/browser_cdm_manager.h" 9 #include "content/browser/media/cdm/browser_cdm_manager.h"
13 #include "content/browser/web_contents/web_contents_impl.h" 10 #include "content/browser/web_contents/web_contents_impl.h"
14 #include "content/common/media/media_player_delegate_messages.h" 11 #include "content/common/media/media_player_delegate_messages.h"
15 #include "content/common/media/media_player_messages_android.h" 12 #include "content/common/media/media_player_messages_android.h"
16 #include "content/common/media/media_session_messages_android.h" 13 #include "content/common/media/media_session_messages_android.h"
17 #include "content/public/browser/render_frame_host.h" 14 #include "content/public/browser/render_frame_host.h"
18 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
19 #include "ipc/ipc_message_macros.h" 16 #include "ipc/ipc_message_macros.h"
20 #include "media/base/android/media_player_android.h" 17 #include "media/base/android/media_player_android.h"
21 18
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 new BrowserMediaSessionManager(render_frame_host); 62 new BrowserMediaSessionManager(render_frame_host);
66 media_session_managers_.set(render_frame_host, make_scoped_ptr(manager)); 63 media_session_managers_.set(render_frame_host, make_scoped_ptr(manager));
67 return manager; 64 return manager;
68 } 65 }
69 66
70 void MediaWebContentsObserverAndroid::SuspendAllMediaPlayers() { 67 void MediaWebContentsObserverAndroid::SuspendAllMediaPlayers() {
71 web_contents()->ForEachFrame( 68 web_contents()->ForEachFrame(
72 base::Bind(&SuspendAllMediaPlayersInRenderFrame)); 69 base::Bind(&SuspendAllMediaPlayersInRenderFrame));
73 } 70 }
74 71
75 bool MediaWebContentsObserverAndroid::RequestPlay(
76 RenderFrameHost* render_frame_host,
77 int delegate_id,
78 bool has_audio,
79 bool is_remote,
80 base::TimeDelta duration) {
81 // |has_video| forced to true since the value doesn't matter at present.
82 OnMediaPlaying(render_frame_host, delegate_id, true, has_audio, is_remote,
83 duration);
84 return media_session_map_.find(MediaPlayerId(
85 render_frame_host, delegate_id)) != media_session_map_.end();
86 }
87
88 #if defined(VIDEO_HOLE) 72 #if defined(VIDEO_HOLE)
89 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() { 73 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() {
90 for (auto it = media_player_managers_.begin(); 74 for (auto it = media_player_managers_.begin();
91 it != media_player_managers_.end(); ++it) { 75 it != media_player_managers_.end(); ++it) {
92 it->second->OnFrameInfoUpdated(); 76 it->second->OnFrameInfoUpdated();
93 } 77 }
94 } 78 }
95 #endif // defined(VIDEO_HOLE) 79 #endif // defined(VIDEO_HOLE)
96 80
97 void MediaWebContentsObserverAndroid::RenderFrameDeleted( 81 void MediaWebContentsObserverAndroid::RenderFrameDeleted(
98 RenderFrameHost* render_frame_host) { 82 RenderFrameHost* render_frame_host) {
99 MediaWebContentsObserver::RenderFrameDeleted(render_frame_host); 83 MediaWebContentsObserver::RenderFrameDeleted(render_frame_host);
100 84
101 for (auto it = media_session_map_.begin(); it != media_session_map_.end();) {
102 if (it->first.first == render_frame_host)
103 it = media_session_map_.erase(it);
104 else
105 ++it;
106 }
107
108 // Always destroy the media players before CDMs because we do not support 85 // Always destroy the media players before CDMs because we do not support
109 // detaching CDMs from media players yet. See http://crbug.com/330324 86 // detaching CDMs from media players yet. See http://crbug.com/330324
110 media_player_managers_.erase(render_frame_host); 87 media_player_managers_.erase(render_frame_host);
111 media_session_managers_.erase(render_frame_host); 88 media_session_managers_.erase(render_frame_host);
112 89
113 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager 90 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
114 // and BrowserCdmManager all run on browser UI thread. So this call is okay. 91 // and BrowserCdmManager all run on browser UI thread. So this call is okay.
115 // In the future we need to support the case where MediaWebContentsObserver 92 // In the future we need to support the case where MediaWebContentsObserver
116 // get notified on browser UI thread, but BrowserMediaPlayerManager and 93 // get notified on browser UI thread, but BrowserMediaPlayerManager and
117 // BrowserCdmManager run on a different thread. 94 // BrowserCdmManager run on a different thread.
118 BrowserCdmManager* browser_cdm_manager = 95 BrowserCdmManager* browser_cdm_manager =
119 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID()); 96 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID());
120 if (browser_cdm_manager) 97 if (browser_cdm_manager)
121 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID()); 98 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());
122 } 99 }
123 100
124 bool MediaWebContentsObserverAndroid::OnMessageReceived( 101 bool MediaWebContentsObserverAndroid::OnMessageReceived(
125 const IPC::Message& msg, 102 const IPC::Message& msg,
126 RenderFrameHost* render_frame_host) { 103 RenderFrameHost* render_frame_host) {
127 // Receive play/pause/destroyed messages, but don't mark as processed so they
128 // are also handled by MediaWebContentsObserver.
129 OnMediaPlayerDelegateMessageReceived(msg, render_frame_host);
130
131 if (MediaWebContentsObserver::OnMessageReceived(msg, render_frame_host)) 104 if (MediaWebContentsObserver::OnMessageReceived(msg, render_frame_host))
132 return true; 105 return true;
133 106
134 if (OnMediaPlayerMessageReceived(msg, render_frame_host)) 107 if (OnMediaPlayerMessageReceived(msg, render_frame_host))
135 return true; 108 return true;
136 109
137 if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host)) 110 if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host))
138 return true; 111 return true;
139 112
140 if (OnMediaSessionMessageReceived(msg, render_frame_host)) 113 if (OnMediaSessionMessageReceived(msg, render_frame_host))
141 return true; 114 return true;
142 115
143 return false; 116 return false;
144 } 117 }
145 118
146 void MediaWebContentsObserverAndroid::OnMediaPlayerDelegateMessageReceived(
147 const IPC::Message& msg,
148 RenderFrameHost* render_frame_host) {
149 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(MediaWebContentsObserverAndroid, msg,
150 render_frame_host)
151 IPC_MESSAGE_HANDLER(MediaPlayerDelegateHostMsg_OnMediaDestroyed,
152 OnMediaDestroyed)
153 IPC_MESSAGE_HANDLER(MediaPlayerDelegateHostMsg_OnMediaPaused, OnMediaPaused)
154 IPC_MESSAGE_HANDLER(MediaPlayerDelegateHostMsg_OnMediaPlaying,
155 OnMediaPlaying)
156 IPC_END_MESSAGE_MAP()
157 }
158
159 bool MediaWebContentsObserverAndroid::OnMediaPlayerMessageReceived( 119 bool MediaWebContentsObserverAndroid::OnMediaPlayerMessageReceived(
160 const IPC::Message& msg, 120 const IPC::Message& msg,
161 RenderFrameHost* render_frame_host) { 121 RenderFrameHost* render_frame_host) {
162 bool handled = true; 122 bool handled = true;
163 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserverAndroid, msg) 123 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserverAndroid, msg)
164 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen, 124 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen,
165 GetMediaPlayerManager(render_frame_host), 125 GetMediaPlayerManager(render_frame_host),
166 BrowserMediaPlayerManager::OnEnterFullscreen) 126 BrowserMediaPlayerManager::OnEnterFullscreen)
167 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Initialize, 127 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Initialize,
168 GetMediaPlayerManager(render_frame_host), 128 GetMediaPlayerManager(render_frame_host),
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 if (!cdm) { 222 if (!cdm) {
263 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; 223 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id;
264 return; 224 return;
265 } 225 }
266 226
267 // TODO(xhwang): This could possibly fail. In that case we should reject the 227 // TODO(xhwang): This could possibly fail. In that case we should reject the
268 // promise. 228 // promise.
269 media_player->SetCdm(cdm); 229 media_player->SetCdm(cdm);
270 } 230 }
271 231
272 void MediaWebContentsObserverAndroid::OnMediaDestroyed(
273 RenderFrameHost* render_frame_host,
274 int delegate_id) {
275 media_session_map_.erase(MediaPlayerId(render_frame_host, delegate_id));
276 }
277
278 void MediaWebContentsObserverAndroid::OnMediaPaused(
279 RenderFrameHost* render_frame_host,
280 int delegate_id,
281 bool reached_end_of_stream) {
282 // Drop the session if playback completes normally.
283 if (reached_end_of_stream) {
284 OnMediaDestroyed(render_frame_host, delegate_id);
285 return;
286 }
287
288 auto it =
289 media_session_map_.find(MediaPlayerId(render_frame_host, delegate_id));
290 if (it == media_session_map_.end())
291 return;
292
293 it->second->OnPlaybackPaused();
294 }
295
296 void MediaWebContentsObserverAndroid::OnMediaPlaying(
297 RenderFrameHost* render_frame_host,
298 int delegate_id,
299 bool has_video,
300 bool has_audio,
301 bool is_remote,
302 base::TimeDelta duration) {
303 const MediaPlayerId id(render_frame_host, delegate_id);
304
305 // Since we don't remove session instances on pause, there may be an existing
306 // instance for this playback attempt.
307 //
308 // In this case, try to reinitialize it with the new settings. If they are
309 // the same, this is a no-op. If the reinitialize fails, destroy the
310 // controller. A later playback attempt will create a new controller.
311 auto it = media_session_map_.find(id);
312 if (it != media_session_map_.end()) {
313 if (!it->second->Initialize(has_audio, is_remote, duration))
314 media_session_map_.erase(it);
315 return;
316 }
317
318 scoped_ptr<MediaSessionController> controller(
319 new MediaSessionController(id, this));
320
321 if (!controller->Initialize(has_audio, is_remote, duration))
322 return;
323
324 media_session_map_[id] = std::move(controller);
325 }
326
327 } // namespace content 232 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698