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

Side by Side Diff: content/browser/media/media_web_contents_observer.cc

Issue 1259633002: NOT FOR LANDING Implement WebMediaSession (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack until something works Created 5 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/media_web_contents_observer.h" 5 #include "content/browser/media/media_web_contents_observer.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "content/browser/media/cdm/browser_cdm_manager.h" 9 #include "content/browser/media/cdm/browser_cdm_manager.h"
10 #include "content/browser/renderer_host/render_process_host_impl.h" 10 #include "content/browser/renderer_host/render_process_host_impl.h"
11 #include "content/browser/web_contents/web_contents_impl.h" 11 #include "content/browser/web_contents/web_contents_impl.h"
12 #include "content/public/browser/render_frame_host.h" 12 #include "content/public/browser/render_frame_host.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "ipc/ipc_message_macros.h" 14 #include "ipc/ipc_message_macros.h"
15 15
16 #if defined(OS_ANDROID) 16 #if defined(OS_ANDROID)
17 #include "content/browser/android/media_players_observer.h" 17 #include "content/browser/android/media_players_observer.h"
18 #include "content/browser/media/android/browser_media_player_manager.h" 18 #include "content/browser/media/android/browser_media_player_manager.h"
19 #include "content/browser/media/android/browser_media_session_manager.h"
19 #include "content/common/media/media_player_messages_android.h" 20 #include "content/common/media/media_player_messages_android.h"
21 #include "content/common/media/media_session_messages_android.h"
20 #include "media/base/android/media_player_android.h" 22 #include "media/base/android/media_player_android.h"
21 #endif // defined(OS_ANDROID) 23 #endif // defined(OS_ANDROID)
22 24
23 namespace content { 25 namespace content {
24 26
25 MediaWebContentsObserver::MediaWebContentsObserver( 27 MediaWebContentsObserver::MediaWebContentsObserver(
26 WebContents* web_contents) 28 WebContents* web_contents)
27 : WebContentsObserver(web_contents) 29 : WebContentsObserver(web_contents)
28 { 30 {
29 } 31 }
30 32
31 MediaWebContentsObserver::~MediaWebContentsObserver() { 33 MediaWebContentsObserver::~MediaWebContentsObserver() {
32 } 34 }
33 35
34 void MediaWebContentsObserver::RenderFrameDeleted( 36 void MediaWebContentsObserver::RenderFrameDeleted(
35 RenderFrameHost* render_frame_host) { 37 RenderFrameHost* render_frame_host) {
36 #if defined(OS_ANDROID) 38 #if defined(OS_ANDROID)
37 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 39 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
38 // Always destroy the media players before CDMs because we do not support 40 // Always destroy the media players before CDMs because we do not support
39 // detaching CDMs from media players yet. See http://crbug.com/330324 41 // detaching CDMs from media players yet. See http://crbug.com/330324
40 media_player_managers_.erase(key); 42 media_player_managers_.erase(key);
43 media_session_managers_.erase(key);
41 44
42 MediaPlayersObserver* audio_observer = GetMediaPlayersObserver(); 45 MediaPlayersObserver* audio_observer = GetMediaPlayersObserver();
43 if (audio_observer) 46 if (audio_observer)
44 audio_observer->RenderFrameDeleted(render_frame_host); 47 audio_observer->RenderFrameDeleted(render_frame_host);
45 #endif 48 #endif
46 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager 49 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
47 // and BrowserCdmManager all run on browser UI thread. So this call is okay. 50 // and BrowserCdmManager all run on browser UI thread. So this call is okay.
48 // In the future we need to support the case where MediaWebContentsObserver 51 // In the future we need to support the case where MediaWebContentsObserver
49 // get notified on browser UI thread, but BrowserMediaPlayerManager and 52 // get notified on browser UI thread, but BrowserMediaPlayerManager and
50 // BrowserCdmManager run on a different thread. 53 // BrowserCdmManager run on a different thread.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 BrowserMediaPlayerManager::OnRequestRemotePlayback) 108 BrowserMediaPlayerManager::OnRequestRemotePlayback)
106 IPC_MESSAGE_FORWARD( 109 IPC_MESSAGE_FORWARD(
107 MediaPlayerHostMsg_RequestRemotePlaybackControl, 110 MediaPlayerHostMsg_RequestRemotePlaybackControl,
108 GetMediaPlayerManager(render_frame_host), 111 GetMediaPlayerManager(render_frame_host),
109 BrowserMediaPlayerManager::OnRequestRemotePlaybackControl) 112 BrowserMediaPlayerManager::OnRequestRemotePlaybackControl)
110 #if defined(VIDEO_HOLE) 113 #if defined(VIDEO_HOLE)
111 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface, 114 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface,
112 GetMediaPlayerManager(render_frame_host), 115 GetMediaPlayerManager(render_frame_host),
113 BrowserMediaPlayerManager::OnNotifyExternalSurface) 116 BrowserMediaPlayerManager::OnNotifyExternalSurface)
114 #endif // defined(VIDEO_HOLE) 117 #endif // defined(VIDEO_HOLE)
118 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Activate,
119 GetMediaSessionManager(render_frame_host),
120 BrowserMediaSessionManager::OnActivate)
121 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Deactivate,
122 GetMediaSessionManager(render_frame_host),
123 BrowserMediaSessionManager::OnDeactivate)
115 IPC_MESSAGE_UNHANDLED(handled = false) 124 IPC_MESSAGE_UNHANDLED(handled = false)
116 IPC_END_MESSAGE_MAP() 125 IPC_END_MESSAGE_MAP()
117 return handled; 126 return handled;
118 } 127 }
119 128
120 bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived( 129 bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived(
121 const IPC::Message& msg, 130 const IPC::Message& msg,
122 RenderFrameHost* render_frame_host) { 131 RenderFrameHost* render_frame_host) {
123 bool handled = true; 132 bool handled = true;
124 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM( 133 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 173 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
165 if (!media_player_managers_.contains(key)) { 174 if (!media_player_managers_.contains(key)) {
166 media_player_managers_.set( 175 media_player_managers_.set(
167 key, 176 key,
168 make_scoped_ptr(BrowserMediaPlayerManager::Create( 177 make_scoped_ptr(BrowserMediaPlayerManager::Create(
169 render_frame_host, GetMediaPlayersObserver()))); 178 render_frame_host, GetMediaPlayersObserver())));
170 } 179 }
171 return media_player_managers_.get(key); 180 return media_player_managers_.get(key);
172 } 181 }
173 182
183 BrowserMediaSessionManager* MediaWebContentsObserver::GetMediaSessionManager(
184 RenderFrameHost* render_frame_host) {
185 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
186 if (!media_session_managers_.contains(key)) {
187 media_session_managers_.set(
188 key,
189 make_scoped_ptr(new BrowserMediaSessionManager(render_frame_host)));
190 }
191 return media_session_managers_.get(key);
192 }
193
174 MediaPlayersObserver* 194 MediaPlayersObserver*
175 MediaWebContentsObserver::GetMediaPlayersObserver() const { 195 MediaWebContentsObserver::GetMediaPlayersObserver() const {
176 AudioStateProvider* provider = 196 AudioStateProvider* provider =
177 static_cast<WebContentsImpl*>(web_contents())->audio_state_provider(); 197 static_cast<WebContentsImpl*>(web_contents())->audio_state_provider();
178 198
179 MediaPlayersObserver* audio_observer = 199 MediaPlayersObserver* audio_observer =
180 static_cast<MediaPlayersObserver*>(provider); 200 static_cast<MediaPlayersObserver*>(provider);
181 201
182 DCHECK(audio_observer); 202 DCHECK(audio_observer);
183 return audio_observer; 203 return audio_observer;
184 } 204 }
185 205
186 #if defined(VIDEO_HOLE) 206 #if defined(VIDEO_HOLE)
187 void MediaWebContentsObserver::OnFrameInfoUpdated() { 207 void MediaWebContentsObserver::OnFrameInfoUpdated() {
188 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); 208 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();
189 iter != media_player_managers_.end(); ++iter) { 209 iter != media_player_managers_.end(); ++iter) {
190 BrowserMediaPlayerManager* manager = iter->second; 210 BrowserMediaPlayerManager* manager = iter->second;
191 manager->OnFrameInfoUpdated(); 211 manager->OnFrameInfoUpdated();
192 } 212 }
193 } 213 }
194 #endif // defined(VIDEO_HOLE) 214 #endif // defined(VIDEO_HOLE)
195 215
196 #endif // defined(OS_ANDROID) 216 #endif // defined(OS_ANDROID)
197 217
198 } // namespace content 218 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698