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

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

Issue 896673003: Propagate audible state from player to the containing tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing copyright notice Created 5 years, 9 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/public/browser/render_frame_host.h" 12 #include "content/public/browser/render_frame_host.h"
12 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
13 #include "ipc/ipc_message_macros.h" 14 #include "ipc/ipc_message_macros.h"
14 15
15 #if defined(OS_ANDROID) 16 #if defined(OS_ANDROID)
17 #include "content/browser/android/media_players_observer.h"
16 #include "content/browser/media/android/browser_media_player_manager.h" 18 #include "content/browser/media/android/browser_media_player_manager.h"
17 #include "content/common/media/media_player_messages_android.h" 19 #include "content/common/media/media_player_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)
28 {
26 } 29 }
27 30
28 MediaWebContentsObserver::~MediaWebContentsObserver() { 31 MediaWebContentsObserver::~MediaWebContentsObserver() {
29 } 32 }
30 33
31 void MediaWebContentsObserver::RenderFrameDeleted( 34 void MediaWebContentsObserver::RenderFrameDeleted(
32 RenderFrameHost* render_frame_host) { 35 RenderFrameHost* render_frame_host) {
33 #if defined(OS_ANDROID) 36 #if defined(OS_ANDROID)
34 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 37 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
35 // 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
36 // detaching CDMs from media players yet. See http://crbug.com/330324 39 // detaching CDMs from media players yet. See http://crbug.com/330324
37 media_player_managers_.erase(key); 40 media_player_managers_.erase(key);
41
42 MediaPlayersObserver* audio_observer = GetMediaPlayersObserver();
43 if (audio_observer)
44 audio_observer->RenderFrameDeleted(render_frame_host);
38 #endif 45 #endif
39 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager 46 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
40 // and BrowserCdmManager all run on browser UI thread. So this call is okay. 47 // and BrowserCdmManager all run on browser UI thread. So this call is okay.
41 // In the future we need to support the case where MediaWebContentsObserver 48 // In the future we need to support the case where MediaWebContentsObserver
42 // get notified on browser UI thread, but BrowserMediaPlayerManager and 49 // get notified on browser UI thread, but BrowserMediaPlayerManager and
43 // BrowserCdmManager run on a different thread. 50 // BrowserCdmManager run on a different thread.
44 BrowserCdmManager* browser_cdm_manager = 51 BrowserCdmManager* browser_cdm_manager =
45 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID()); 52 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID());
46 if (browser_cdm_manager) 53 if (browser_cdm_manager)
47 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID()); 54 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 // promise. 161 // promise.
155 media_player->SetCdm(cdm); 162 media_player->SetCdm(cdm);
156 } 163 }
157 164
158 BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager( 165 BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager(
159 RenderFrameHost* render_frame_host) { 166 RenderFrameHost* render_frame_host) {
160 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 167 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
161 if (!media_player_managers_.contains(key)) { 168 if (!media_player_managers_.contains(key)) {
162 media_player_managers_.set( 169 media_player_managers_.set(
163 key, 170 key,
164 make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host))); 171 make_scoped_ptr(BrowserMediaPlayerManager::Create(
172 render_frame_host, GetMediaPlayersObserver())));
165 } 173 }
166 return media_player_managers_.get(key); 174 return media_player_managers_.get(key);
167 } 175 }
168 176
177 MediaPlayersObserver*
178 MediaWebContentsObserver::GetMediaPlayersObserver() const {
179 AudioStateProvider* provider =
180 static_cast<WebContentsImpl*>(web_contents())->audio_state_provider();
181
182 MediaPlayersObserver* audio_observer =
183 static_cast<MediaPlayersObserver*>(provider);
184
185 DCHECK(audio_observer);
186 return audio_observer;
187 }
188
169 #if defined(VIDEO_HOLE) 189 #if defined(VIDEO_HOLE)
170 void MediaWebContentsObserver::OnFrameInfoUpdated() { 190 void MediaWebContentsObserver::OnFrameInfoUpdated() {
171 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); 191 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();
172 iter != media_player_managers_.end(); ++iter) { 192 iter != media_player_managers_.end(); ++iter) {
173 BrowserMediaPlayerManager* manager = iter->second; 193 BrowserMediaPlayerManager* manager = iter->second;
174 manager->OnFrameInfoUpdated(); 194 manager->OnFrameInfoUpdated();
175 } 195 }
176 } 196 }
177 #endif // defined(VIDEO_HOLE) 197 #endif // defined(VIDEO_HOLE)
178 198
179 #endif // defined(OS_ANDROID) 199 #endif // defined(OS_ANDROID)
180 200
181 } // namespace content 201 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_web_contents_observer.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698