OLD | NEW |
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/public/browser/render_frame_host.h" | 11 #include "content/public/browser/render_frame_host.h" |
12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
13 #include "ipc/ipc_message_macros.h" | 13 #include "ipc/ipc_message_macros.h" |
14 | 14 |
15 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
16 #include "content/browser/media/android/browser_media_player_manager.h" | 16 #include "content/browser/media/android/browser_media_player_manager.h" |
| 17 #include "content/browser/media/android/browser_media_session_manager.h" |
17 #include "content/common/media/media_player_messages_android.h" | 18 #include "content/common/media/media_player_messages_android.h" |
| 19 #include "content/common/media/media_session_messages_android.h" |
18 #include "media/base/android/media_player_android.h" | 20 #include "media/base/android/media_player_android.h" |
19 #endif // defined(OS_ANDROID) | 21 #endif // defined(OS_ANDROID) |
20 | 22 |
21 namespace content { | 23 namespace content { |
22 | 24 |
23 MediaWebContentsObserver::MediaWebContentsObserver( | 25 MediaWebContentsObserver::MediaWebContentsObserver( |
24 WebContents* web_contents) | 26 WebContents* web_contents) |
25 : WebContentsObserver(web_contents) | 27 : WebContentsObserver(web_contents) |
26 { | 28 { |
27 } | 29 } |
28 | 30 |
29 MediaWebContentsObserver::~MediaWebContentsObserver() { | 31 MediaWebContentsObserver::~MediaWebContentsObserver() { |
30 } | 32 } |
31 | 33 |
32 void MediaWebContentsObserver::RenderFrameDeleted( | 34 void MediaWebContentsObserver::RenderFrameDeleted( |
33 RenderFrameHost* render_frame_host) { | 35 RenderFrameHost* render_frame_host) { |
34 #if defined(OS_ANDROID) | 36 #if defined(OS_ANDROID) |
35 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); | 37 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); |
36 // Always destroy the media players before CDMs because we do not support | 38 // Always destroy the media players before CDMs because we do not support |
37 // detaching CDMs from media players yet. See http://crbug.com/330324 | 39 // detaching CDMs from media players yet. See http://crbug.com/330324 |
38 media_player_managers_.erase(key); | 40 media_player_managers_.erase(key); |
| 41 media_session_managers_.erase(key); |
39 #endif | 42 #endif |
40 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager | 43 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager |
41 // and BrowserCdmManager all run on browser UI thread. So this call is okay. | 44 // and BrowserCdmManager all run on browser UI thread. So this call is okay. |
42 // In the future we need to support the case where MediaWebContentsObserver | 45 // In the future we need to support the case where MediaWebContentsObserver |
43 // get notified on browser UI thread, but BrowserMediaPlayerManager and | 46 // get notified on browser UI thread, but BrowserMediaPlayerManager and |
44 // BrowserCdmManager run on a different thread. | 47 // BrowserCdmManager run on a different thread. |
45 BrowserCdmManager* browser_cdm_manager = | 48 BrowserCdmManager* browser_cdm_manager = |
46 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID()); | 49 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID()); |
47 if (browser_cdm_manager) | 50 if (browser_cdm_manager) |
48 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID()); | 51 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID()); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 BrowserMediaPlayerManager::OnRequestRemotePlayback) | 102 BrowserMediaPlayerManager::OnRequestRemotePlayback) |
100 IPC_MESSAGE_FORWARD( | 103 IPC_MESSAGE_FORWARD( |
101 MediaPlayerHostMsg_RequestRemotePlaybackControl, | 104 MediaPlayerHostMsg_RequestRemotePlaybackControl, |
102 GetMediaPlayerManager(render_frame_host), | 105 GetMediaPlayerManager(render_frame_host), |
103 BrowserMediaPlayerManager::OnRequestRemotePlaybackControl) | 106 BrowserMediaPlayerManager::OnRequestRemotePlaybackControl) |
104 #if defined(VIDEO_HOLE) | 107 #if defined(VIDEO_HOLE) |
105 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface, | 108 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface, |
106 GetMediaPlayerManager(render_frame_host), | 109 GetMediaPlayerManager(render_frame_host), |
107 BrowserMediaPlayerManager::OnNotifyExternalSurface) | 110 BrowserMediaPlayerManager::OnNotifyExternalSurface) |
108 #endif // defined(VIDEO_HOLE) | 111 #endif // defined(VIDEO_HOLE) |
| 112 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Activate, |
| 113 GetMediaSessionManager(render_frame_host), |
| 114 BrowserMediaSessionManager::OnActivate) |
| 115 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Deactivate, |
| 116 GetMediaSessionManager(render_frame_host), |
| 117 BrowserMediaSessionManager::OnDeactivate) |
109 IPC_MESSAGE_UNHANDLED(handled = false) | 118 IPC_MESSAGE_UNHANDLED(handled = false) |
110 IPC_END_MESSAGE_MAP() | 119 IPC_END_MESSAGE_MAP() |
111 return handled; | 120 return handled; |
112 } | 121 } |
113 | 122 |
114 bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived( | 123 bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived( |
115 const IPC::Message& msg, | 124 const IPC::Message& msg, |
116 RenderFrameHost* render_frame_host) { | 125 RenderFrameHost* render_frame_host) { |
117 bool handled = true; | 126 bool handled = true; |
118 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM( | 127 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM( |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 RenderFrameHost* render_frame_host) { | 166 RenderFrameHost* render_frame_host) { |
158 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); | 167 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); |
159 if (!media_player_managers_.contains(key)) { | 168 if (!media_player_managers_.contains(key)) { |
160 media_player_managers_.set( | 169 media_player_managers_.set( |
161 key, | 170 key, |
162 make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host))); | 171 make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host))); |
163 } | 172 } |
164 return media_player_managers_.get(key); | 173 return media_player_managers_.get(key); |
165 } | 174 } |
166 | 175 |
| 176 BrowserMediaSessionManager* MediaWebContentsObserver::GetMediaSessionManager( |
| 177 RenderFrameHost* render_frame_host) { |
| 178 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); |
| 179 if (!media_session_managers_.contains(key)) { |
| 180 media_session_managers_.set( |
| 181 key, |
| 182 make_scoped_ptr(new BrowserMediaSessionManager(render_frame_host))); |
| 183 } |
| 184 return media_session_managers_.get(key); |
| 185 } |
| 186 |
167 #if defined(VIDEO_HOLE) | 187 #if defined(VIDEO_HOLE) |
168 void MediaWebContentsObserver::OnFrameInfoUpdated() { | 188 void MediaWebContentsObserver::OnFrameInfoUpdated() { |
169 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); | 189 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); |
170 iter != media_player_managers_.end(); ++iter) { | 190 iter != media_player_managers_.end(); ++iter) { |
171 BrowserMediaPlayerManager* manager = iter->second; | 191 BrowserMediaPlayerManager* manager = iter->second; |
172 manager->OnFrameInfoUpdated(); | 192 manager->OnFrameInfoUpdated(); |
173 } | 193 } |
174 } | 194 } |
175 #endif // defined(VIDEO_HOLE) | 195 #endif // defined(VIDEO_HOLE) |
176 | 196 |
177 #endif // defined(OS_ANDROID) | 197 #endif // defined(OS_ANDROID) |
178 | 198 |
179 } // namespace content | 199 } // namespace content |
OLD | NEW |