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

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: 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 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"
9 #include "content/browser/media/android/media_session_observer.h" 10 #include "content/browser/media/android/media_session_observer.h"
10 #include "content/browser/media/cdm/browser_cdm_manager.h" 11 #include "content/browser/media/cdm/browser_cdm_manager.h"
11 #include "content/browser/web_contents/web_contents_impl.h" 12 #include "content/browser/web_contents/web_contents_impl.h"
13 #include "content/common/frame_messages.h"
12 #include "content/common/media/media_player_messages_android.h" 14 #include "content/common/media/media_player_messages_android.h"
13 #include "content/common/media/media_session_messages_android.h" 15 #include "content/common/media/media_session_messages_android.h"
14 #include "content/public/browser/render_frame_host.h" 16 #include "content/public/browser/render_frame_host.h"
15 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
16 #include "ipc/ipc_message_macros.h" 18 #include "ipc/ipc_message_macros.h"
17 #include "media/base/android/media_player_android.h" 19 #include "media/base/android/media_player_android.h"
18 20
19 namespace content { 21 namespace content {
20 22
23 class MediaSessionController : public MediaSessionObserver {
24 public:
25 MediaSessionController(const WebContentsObserver::MediaPlayerId& id,
26 MediaWebContentsObserver* media_web_contents_observer)
27 : id_(id), media_web_contents_observer_(media_web_contents_observer) {}
28
29 // Clients must call this after construction and destroy the controller if it
30 // returns false.
31 bool Initialize(bool has_audio, bool is_remote, base::TimeDelta duration) {
32 // These objects are only created on the UI thread, so this is safe.
33 static uint32_t player_id = 0;
34 player_id_ = static_cast<int>(player_id++);
35
36 // Don't bother with a MediaSession for remote players or without audio.
37 if (!has_audio || is_remote)
38 return true;
39
40 // Minimal duration of a player in order to be considered as Content type.
41 const base::TimeDelta kMinimumDurationForContent =
42 base::TimeDelta::FromSeconds(5);
43
44 const MediaSession::Type media_session_type =
45 duration == base::TimeDelta() || duration > kMinimumDurationForContent
46 ? MediaSession::Type::Content
47 : MediaSession::Type::Transient;
48
49 // If a session can't be created, force a pause immediately.
50 if (!MediaSession::Get(media_web_contents_observer_->web_contents())
51 ->AddPlayer(this, player_id_, media_session_type)) {
52 OnSuspend(player_id_);
53 return false;
54 }
55
56 initialized_ = true;
57 return true;
58 }
59
60 ~MediaSessionController() {
61 if (initialized_) {
62 MediaSession::Get(media_web_contents_observer_->web_contents())
63 ->RemovePlayer(this, player_id_);
64 }
65 }
66
67 void OnSuspend(int player_id) {
68 DCHECK_EQ(player_id_, player_id);
69 media_web_contents_observer_->Send(
70 new FrameMsg_MediaDelegatePause(id_.first->GetRoutingID(), id_.second));
71 }
72
73 void OnResume(int player_id) {
74 DCHECK_EQ(player_id_, player_id);
75 media_web_contents_observer_->Send(
76 new FrameMsg_MediaDelegatePlay(id_.first->GetRoutingID(), id_.second));
77 }
78
79 void PausePlayback() {
80 MediaSession* session =
81 MediaSession::Get(media_web_contents_observer_->web_contents());
82 // We check for suspension here since the renderer may issue its own pause
83 // in response to or while a pause from the browser is in flight.
84 if (!session->IsSuspended())
85 session->OnPlayerPaused(this, player_id_);
86 }
87
88 private:
89 const WebContentsObserver::MediaPlayerId id_;
90 MediaWebContentsObserver* const media_web_contents_observer_;
91 int player_id_ = 0;
92 bool initialized_ = false;
93
94 DISALLOW_COPY_AND_ASSIGN(MediaSessionController);
95 };
96
21 MediaWebContentsObserverAndroid::MediaWebContentsObserverAndroid( 97 MediaWebContentsObserverAndroid::MediaWebContentsObserverAndroid(
22 WebContents* web_contents) 98 WebContents* web_contents)
23 : MediaWebContentsObserver(web_contents) {} 99 : MediaWebContentsObserver(web_contents) {}
24 100
25 MediaWebContentsObserverAndroid::~MediaWebContentsObserverAndroid() {} 101 MediaWebContentsObserverAndroid::~MediaWebContentsObserverAndroid() {}
26 102
27 // static 103 // static
28 MediaWebContentsObserverAndroid* 104 MediaWebContentsObserverAndroid*
29 MediaWebContentsObserverAndroid::FromWebContents(WebContents* web_contents) { 105 MediaWebContentsObserverAndroid::FromWebContents(WebContents* web_contents) {
30 return static_cast<MediaWebContentsObserverAndroid*>( 106 return static_cast<MediaWebContentsObserverAndroid*>(
(...skipping 20 matching lines...) Expand all
51 auto it = media_session_managers_.find(render_frame_host); 127 auto it = media_session_managers_.find(render_frame_host);
52 if (it != media_session_managers_.end()) 128 if (it != media_session_managers_.end())
53 return it->second; 129 return it->second;
54 130
55 BrowserMediaSessionManager* manager = 131 BrowserMediaSessionManager* manager =
56 new BrowserMediaSessionManager(render_frame_host); 132 new BrowserMediaSessionManager(render_frame_host);
57 media_session_managers_.set(render_frame_host, make_scoped_ptr(manager)); 133 media_session_managers_.set(render_frame_host, make_scoped_ptr(manager));
58 return manager; 134 return manager;
59 } 135 }
60 136
137 bool MediaWebContentsObserverAndroid::RequestPlay(
138 RenderFrameHost* render_frame_host,
139 int64_t player_cookie,
140 bool has_audio,
141 bool is_remote,
142 base::TimeDelta duration) {
143 // |has_video| forced to true since the value doesn't matter at present.
144 OnMediaPlayingNotification(render_frame_host, player_cookie, true,
145 has_audio, is_remote, duration);
146 return media_session_map_.find(MediaPlayerId(
147 render_frame_host, player_cookie)) != media_session_map_.end();
148 }
149
61 #if defined(VIDEO_HOLE) 150 #if defined(VIDEO_HOLE)
62 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() { 151 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() {
63 for (auto it = media_player_managers_.begin(); 152 for (auto it = media_player_managers_.begin();
64 it != media_player_managers_.end(); ++it) { 153 it != media_player_managers_.end(); ++it) {
65 it->second->OnFrameInfoUpdated(); 154 it->second->OnFrameInfoUpdated();
66 } 155 }
67 } 156 }
68 #endif // defined(VIDEO_HOLE) 157 #endif // defined(VIDEO_HOLE)
69 158
70 void MediaWebContentsObserverAndroid::RenderFrameDeleted( 159 void MediaWebContentsObserverAndroid::RenderFrameDeleted(
71 RenderFrameHost* render_frame_host) { 160 RenderFrameHost* render_frame_host) {
72 MediaWebContentsObserver::RenderFrameDeleted(render_frame_host); 161 MediaWebContentsObserver::RenderFrameDeleted(render_frame_host);
73 162
163 for (auto it = media_session_map_.begin(); it != media_session_map_.end();) {
164 if (it->first.first == render_frame_host)
165 it = media_session_map_.erase(it);
166 else
167 ++it;
168 }
169
74 // Always destroy the media players before CDMs because we do not support 170 // Always destroy the media players before CDMs because we do not support
75 // detaching CDMs from media players yet. See http://crbug.com/330324 171 // detaching CDMs from media players yet. See http://crbug.com/330324
76 media_player_managers_.erase(render_frame_host); 172 media_player_managers_.erase(render_frame_host);
77 media_session_managers_.erase(render_frame_host); 173 media_session_managers_.erase(render_frame_host);
78 174
79 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager 175 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
80 // and BrowserCdmManager all run on browser UI thread. So this call is okay. 176 // 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 177 // In the future we need to support the case where MediaWebContentsObserver
82 // get notified on browser UI thread, but BrowserMediaPlayerManager and 178 // get notified on browser UI thread, but BrowserMediaPlayerManager and
83 // BrowserCdmManager run on a different thread. 179 // BrowserCdmManager run on a different thread.
84 BrowserCdmManager* browser_cdm_manager = 180 BrowserCdmManager* browser_cdm_manager =
85 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID()); 181 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID());
86 if (browser_cdm_manager) 182 if (browser_cdm_manager)
87 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID()); 183 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());
88 } 184 }
89 185
90 bool MediaWebContentsObserverAndroid::OnMessageReceived( 186 bool MediaWebContentsObserverAndroid::OnMessageReceived(
91 const IPC::Message& msg, 187 const IPC::Message& msg,
92 RenderFrameHost* render_frame_host) { 188 RenderFrameHost* render_frame_host) {
189 // Receive play/pause/destroyed messages, but don't mark as processed so they
190 // are also handled by MediaWebContentsObserver.
191 OnMediaPlayerDelegateMessageReceived(msg, render_frame_host);
192
93 if (MediaWebContentsObserver::OnMessageReceived(msg, render_frame_host)) 193 if (MediaWebContentsObserver::OnMessageReceived(msg, render_frame_host))
94 return true; 194 return true;
95 195
96 if (OnMediaPlayerMessageReceived(msg, render_frame_host)) 196 if (OnMediaPlayerMessageReceived(msg, render_frame_host))
97 return true; 197 return true;
98 198
99 return OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host); 199 return OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host);
100 } 200 }
101 201
202 void MediaWebContentsObserverAndroid::OnMediaPlayerDelegateMessageReceived(
203 const IPC::Message& msg,
204 RenderFrameHost* render_frame_host) {
205 // TODO(dalecurtis): These should no longer be FrameHostMsg.
206 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(MediaWebContentsObserverAndroid, msg,
207 render_frame_host)
208 IPC_MESSAGE_HANDLER(FrameHostMsg_MediaDestroyedNotification,
209 OnMediaDestroyedNotification)
210 IPC_MESSAGE_HANDLER(FrameHostMsg_MediaPlayingNotification,
211 OnMediaPlayingNotification)
212 IPC_MESSAGE_HANDLER(FrameHostMsg_MediaPausedNotification,
213 OnMediaPausedNotification)
214 IPC_END_MESSAGE_MAP()
215 }
216
102 bool MediaWebContentsObserverAndroid::OnMediaPlayerMessageReceived( 217 bool MediaWebContentsObserverAndroid::OnMediaPlayerMessageReceived(
103 const IPC::Message& msg, 218 const IPC::Message& msg,
104 RenderFrameHost* render_frame_host) { 219 RenderFrameHost* render_frame_host) {
105 bool handled = true; 220 bool handled = true;
106 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserverAndroid, msg) 221 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserverAndroid, msg)
107 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen, 222 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen,
108 GetMediaPlayerManager(render_frame_host), 223 GetMediaPlayerManager(render_frame_host),
109 BrowserMediaPlayerManager::OnEnterFullscreen) 224 BrowserMediaPlayerManager::OnEnterFullscreen)
110 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Initialize, 225 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Initialize,
111 GetMediaPlayerManager(render_frame_host), 226 GetMediaPlayerManager(render_frame_host),
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 if (!cdm) { 305 if (!cdm) {
191 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; 306 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id;
192 return; 307 return;
193 } 308 }
194 309
195 // TODO(xhwang): This could possibly fail. In that case we should reject the 310 // TODO(xhwang): This could possibly fail. In that case we should reject the
196 // promise. 311 // promise.
197 media_player->SetCdm(cdm); 312 media_player->SetCdm(cdm);
198 } 313 }
199 314
315 void MediaWebContentsObserverAndroid::OnMediaDestroyedNotification(
316 RenderFrameHost* render_frame_host,
317 int64_t player_cookie) {
318 media_session_map_.erase(MediaPlayerId(render_frame_host, player_cookie));
319 }
320
321 void MediaWebContentsObserverAndroid::OnMediaPlayingNotification(
322 RenderFrameHost* render_frame_host,
323 int64_t player_cookie,
324 bool has_video,
325 bool has_audio,
326 bool is_remote,
327 base::TimeDelta duration) {
328 // TODO(dalecurtis): Remove this allowance once RequestPlay() is deleted.
329 const MediaPlayerId id(render_frame_host, player_cookie);
330 if (media_session_map_.find(id) != media_session_map_.end())
331 return;
332
333 scoped_ptr<MediaSessionController> controller(
334 new MediaSessionController(id, this));
335
336 // If initialize fails, the controller should be destroyed and a new one
337 // attempted later after another playback attempt occurs.
338 if (!controller->Initialize(has_audio, is_remote, duration))
339 return;
340
341 media_session_map_[id] = std::move(controller);
342 }
343
344 void MediaWebContentsObserverAndroid::OnMediaPausedNotification(
345 RenderFrameHost* render_frame_host,
346 int64_t player_cookie,
347 bool reached_end_of_stream) {
348 // Drop the session if playback completes normally.
349 if (reached_end_of_stream) {
350 OnMediaDestroyedNotification(render_frame_host, player_cookie);
351 return;
352 }
353
354 auto it =
355 media_session_map_.find(MediaPlayerId(render_frame_host, player_cookie));
356 if (it == media_session_map_.end())
357 return;
358
359 it->second->PausePlayback();
360 }
361
200 } // namespace content 362 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698