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

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

Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review. Please diff against PS1 for easy life. Created 6 years, 6 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 | Annotate | Revision Log
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/android/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/android/browser_media_player_manager.h"
10 #include "content/browser/media/cdm/browser_cdm_manager.h" 9 #include "content/browser/media/cdm/browser_cdm_manager.h"
11 #include "content/common/media/cdm_messages.h" 10 #include "content/common/media/cdm_messages.h"
12 #include "content/common/media/media_player_messages_android.h"
13 #include "content/public/browser/render_frame_host.h" 11 #include "content/public/browser/render_frame_host.h"
14 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
15 #include "ipc/ipc_message_macros.h" 13 #include "ipc/ipc_message_macros.h"
14
15 #if defined(OS_ANDROID)
16 #include "content/browser/media/android/browser_media_player_manager.h"
17 #include "content/common/media/media_player_messages_android.h"
16 #include "media/base/android/media_player_android.h" 18 #include "media/base/android/media_player_android.h"
19 #endif // defined(OS_ANDROID)
17 20
18 namespace content { 21 namespace content {
19 22
20 using media::BrowserCdm;
21 using media::MediaPlayerAndroid;
22
23 MediaWebContentsObserver::MediaWebContentsObserver( 23 MediaWebContentsObserver::MediaWebContentsObserver(
24 RenderViewHost* render_view_host) 24 RenderViewHost* render_view_host)
25 : WebContentsObserver(WebContents::FromRenderViewHost(render_view_host)) { 25 : WebContentsObserver(WebContents::FromRenderViewHost(render_view_host)) {
26 } 26 }
27 27
28 MediaWebContentsObserver::~MediaWebContentsObserver() { 28 MediaWebContentsObserver::~MediaWebContentsObserver() {
29 } 29 }
30 30
31 void MediaWebContentsObserver::RenderFrameDeleted( 31 void MediaWebContentsObserver::RenderFrameDeleted(
32 RenderFrameHost* render_frame_host) { 32 RenderFrameHost* render_frame_host) {
33 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 33 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
34 #if defined(OS_ANDROID)
34 media_player_managers_.erase(key); 35 media_player_managers_.erase(key);
36 #endif
35 cdm_managers_.erase(key); 37 cdm_managers_.erase(key);
36 } 38 }
37 39
38 bool MediaWebContentsObserver::OnMessageReceived( 40 bool MediaWebContentsObserver::OnMessageReceived(
39 const IPC::Message& msg, 41 const IPC::Message& msg,
40 RenderFrameHost* render_frame_host) { 42 RenderFrameHost* render_frame_host) {
43 #if defined(OS_ANDROID)
41 if (OnMediaPlayerMessageReceived(msg, render_frame_host)) 44 if (OnMediaPlayerMessageReceived(msg, render_frame_host))
42 return true; 45 return true;
43 46
47 if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host))
48 return true;
49 #endif // defined(OS_ANDROID)
50
44 if (OnCdmMessageReceived(msg, render_frame_host)) 51 if (OnCdmMessageReceived(msg, render_frame_host))
45 return true; 52 return true;
46 53
47 if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host))
48 return true;
49
50 return false; 54 return false;
51 } 55 }
52 56
57 #if defined(OS_ANDROID)
53 bool MediaWebContentsObserver::OnMediaPlayerMessageReceived( 58 bool MediaWebContentsObserver::OnMediaPlayerMessageReceived(
54 const IPC::Message& msg, 59 const IPC::Message& msg,
55 RenderFrameHost* render_frame_host) { 60 RenderFrameHost* render_frame_host) {
56 bool handled = true; 61 bool handled = true;
57 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserver, msg) 62 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserver, msg)
58 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen, 63 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen,
59 GetMediaPlayerManager(render_frame_host), 64 GetMediaPlayerManager(render_frame_host),
60 BrowserMediaPlayerManager::OnEnterFullscreen) 65 BrowserMediaPlayerManager::OnEnterFullscreen)
61 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_ExitFullscreen, 66 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_ExitFullscreen,
62 GetMediaPlayerManager(render_frame_host), 67 GetMediaPlayerManager(render_frame_host),
(...skipping 28 matching lines...) Expand all
91 #if defined(VIDEO_HOLE) 96 #if defined(VIDEO_HOLE)
92 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface, 97 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface,
93 GetMediaPlayerManager(render_frame_host), 98 GetMediaPlayerManager(render_frame_host),
94 BrowserMediaPlayerManager::OnNotifyExternalSurface) 99 BrowserMediaPlayerManager::OnNotifyExternalSurface)
95 #endif // defined(VIDEO_HOLE) 100 #endif // defined(VIDEO_HOLE)
96 IPC_MESSAGE_UNHANDLED(handled = false) 101 IPC_MESSAGE_UNHANDLED(handled = false)
97 IPC_END_MESSAGE_MAP() 102 IPC_END_MESSAGE_MAP()
98 return handled; 103 return handled;
99 } 104 }
100 105
101 bool MediaWebContentsObserver::OnCdmMessageReceived(
102 const IPC::Message& msg,
103 RenderFrameHost* render_frame_host) {
104 bool handled = true;
105 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserver, msg)
106 IPC_MESSAGE_FORWARD(CdmHostMsg_InitializeCdm,
107 GetCdmManager(render_frame_host),
108 BrowserCdmManager::OnInitializeCdm)
109 IPC_MESSAGE_FORWARD(CdmHostMsg_CreateSession,
110 GetCdmManager(render_frame_host),
111 BrowserCdmManager::OnCreateSession)
112 IPC_MESSAGE_FORWARD(CdmHostMsg_UpdateSession,
113 GetCdmManager(render_frame_host),
114 BrowserCdmManager::OnUpdateSession)
115 IPC_MESSAGE_FORWARD(CdmHostMsg_ReleaseSession,
116 GetCdmManager(render_frame_host),
117 BrowserCdmManager::OnReleaseSession)
118 IPC_MESSAGE_FORWARD(CdmHostMsg_DestroyCdm,
119 GetCdmManager(render_frame_host),
120 BrowserCdmManager::OnDestroyCdm)
121 IPC_MESSAGE_UNHANDLED(handled = false)
122 IPC_END_MESSAGE_MAP()
123 return handled;
124 }
125
126 bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived( 106 bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived(
127 const IPC::Message& msg, 107 const IPC::Message& msg,
128 RenderFrameHost* render_frame_host) { 108 RenderFrameHost* render_frame_host) {
129 bool handled = true; 109 bool handled = true;
130 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM( 110 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(
131 MediaWebContentsObserver, msg, render_frame_host) 111 MediaWebContentsObserver, msg, render_frame_host)
132 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetCdm, OnSetCdm) 112 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetCdm, OnSetCdm)
133 IPC_MESSAGE_UNHANDLED(handled = false) 113 IPC_MESSAGE_UNHANDLED(handled = false)
134 IPC_END_MESSAGE_MAP() 114 IPC_END_MESSAGE_MAP()
135 return handled; 115 return handled;
136 } 116 }
137 117
138 void MediaWebContentsObserver::OnSetCdm(RenderFrameHost* render_frame_host, 118 void MediaWebContentsObserver::OnSetCdm(RenderFrameHost* render_frame_host,
139 int player_id, 119 int player_id,
140 int cdm_id) { 120 int cdm_id) {
141 MediaPlayerAndroid* media_player = 121 media::MediaPlayerAndroid* media_player =
142 GetMediaPlayerManager(render_frame_host)->GetPlayer(player_id); 122 GetMediaPlayerManager(render_frame_host)->GetPlayer(player_id);
143 if (!media_player) { 123 if (!media_player) {
144 NOTREACHED() << "OnSetCdm: MediaPlayer not found for " << player_id; 124 NOTREACHED() << "OnSetCdm: MediaPlayer not found for " << player_id;
145 return; 125 return;
146 } 126 }
147 127
148 BrowserCdm* cdm = GetCdmManager(render_frame_host)->GetCdm(cdm_id); 128 media::BrowserCdm* cdm = GetCdmManager(render_frame_host)->GetCdm(cdm_id);
149 if (!cdm) { 129 if (!cdm) {
150 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; 130 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id;
151 return; 131 return;
152 } 132 }
153 133
154 // TODO(xhwang): This could possibly fail. In that case we should reject the 134 // TODO(xhwang): This could possibly fail. In that case we should reject the
155 // promise. 135 // promise.
156 media_player->SetCdm(cdm); 136 media_player->SetCdm(cdm);
157 } 137 }
158 138
159 BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager( 139 BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager(
160 RenderFrameHost* render_frame_host) { 140 RenderFrameHost* render_frame_host) {
161 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 141 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
162 if (!media_player_managers_.contains(key)) { 142 if (!media_player_managers_.contains(key)) {
163 media_player_managers_.set( 143 media_player_managers_.set(
164 key, 144 key,
165 make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host))); 145 make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host)));
166 } 146 }
167 return media_player_managers_.get(key); 147 return media_player_managers_.get(key);
168 } 148 }
169 149
170 BrowserCdmManager* MediaWebContentsObserver::GetCdmManager(
171 RenderFrameHost* render_frame_host) {
172 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
173 if (!cdm_managers_.contains(key)) {
174 cdm_managers_.set(
175 key, make_scoped_ptr(BrowserCdmManager::Create(render_frame_host)));
176 }
177 return cdm_managers_.get(key);
178 }
179
180 void MediaWebContentsObserver::PauseVideo() { 150 void MediaWebContentsObserver::PauseVideo() {
181 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); 151 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();
182 iter != media_player_managers_.end(); ++iter) { 152 iter != media_player_managers_.end(); ++iter) {
183 BrowserMediaPlayerManager* manager = iter->second; 153 BrowserMediaPlayerManager* manager = iter->second;
184 manager->PauseVideo(); 154 manager->PauseVideo();
185 } 155 }
186 } 156 }
187 157
188 #if defined(VIDEO_HOLE) 158 #if defined(VIDEO_HOLE)
189 void MediaWebContentsObserver::OnFrameInfoUpdated() { 159 void MediaWebContentsObserver::OnFrameInfoUpdated() {
190 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); 160 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();
191 iter != media_player_managers_.end(); ++iter) { 161 iter != media_player_managers_.end(); ++iter) {
192 BrowserMediaPlayerManager* manager = iter->second; 162 BrowserMediaPlayerManager* manager = iter->second;
193 manager->OnFrameInfoUpdated(); 163 manager->OnFrameInfoUpdated();
194 } 164 }
195 } 165 }
196 #endif // defined(VIDEO_HOLE) 166 #endif // defined(VIDEO_HOLE)
197 167
168 #endif // defined(OS_ANDROID)
169
170 bool MediaWebContentsObserver::OnCdmMessageReceived(
171 const IPC::Message& msg,
172 RenderFrameHost* render_frame_host) {
173 bool handled = true;
174 IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserver, msg)
175 IPC_MESSAGE_FORWARD(CdmHostMsg_InitializeCdm,
176 GetCdmManager(render_frame_host),
177 BrowserCdmManager::OnInitializeCdm)
178 IPC_MESSAGE_FORWARD(CdmHostMsg_CreateSession,
179 GetCdmManager(render_frame_host),
180 BrowserCdmManager::OnCreateSession)
181 IPC_MESSAGE_FORWARD(CdmHostMsg_UpdateSession,
182 GetCdmManager(render_frame_host),
183 BrowserCdmManager::OnUpdateSession)
184 IPC_MESSAGE_FORWARD(CdmHostMsg_ReleaseSession,
185 GetCdmManager(render_frame_host),
186 BrowserCdmManager::OnReleaseSession)
187 IPC_MESSAGE_FORWARD(CdmHostMsg_DestroyCdm,
188 GetCdmManager(render_frame_host),
189 BrowserCdmManager::OnDestroyCdm)
190 IPC_MESSAGE_UNHANDLED(handled = false)
191 IPC_END_MESSAGE_MAP()
192 return handled;
193 }
194
195 BrowserCdmManager* MediaWebContentsObserver::GetCdmManager(
196 RenderFrameHost* render_frame_host) {
197 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
198 if (!cdm_managers_.contains(key)) {
199 cdm_managers_.set(
200 key, make_scoped_ptr(BrowserCdmManager::Create(render_frame_host)));
201 }
202 return cdm_managers_.get(key);
203 }
204
205
198 } // namespace content 206 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698