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

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: Addressed Ted's comments and compiled IsAudible() only under OS_ANDROID Created 5 years, 10 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/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/android/audio_monitor_android.h"
16 #include "content/browser/media/android/browser_media_player_manager.h" 17 #include "content/browser/media/android/browser_media_player_manager.h"
17 #include "content/common/media/media_player_messages_android.h" 18 #include "content/common/media/media_player_messages_android.h"
18 #include "media/base/android/media_player_android.h" 19 #include "media/base/android/media_player_android.h"
19 #endif // defined(OS_ANDROID) 20 #endif // defined(OS_ANDROID)
20 21
21 namespace content { 22 namespace content {
22 23
23 MediaWebContentsObserver::MediaWebContentsObserver( 24 MediaWebContentsObserver::MediaWebContentsObserver(
24 WebContents* web_contents) 25 WebContents* web_contents)
25 : WebContentsObserver(web_contents) { 26 : WebContentsObserver(web_contents)
27 #if defined (OS_ANDROID)
28 , audio_monitor_(new AudioMonitorAndroid(web_contents))
29 #endif // defined (OS_ANDROID)
30 {
26 } 31 }
27 32
28 MediaWebContentsObserver::~MediaWebContentsObserver() { 33 MediaWebContentsObserver::~MediaWebContentsObserver() {
29 } 34 }
30 35
31 void MediaWebContentsObserver::RenderFrameDeleted( 36 void MediaWebContentsObserver::RenderFrameDeleted(
32 RenderFrameHost* render_frame_host) { 37 RenderFrameHost* render_frame_host) {
33 #if defined(OS_ANDROID) 38 #if defined(OS_ANDROID)
34 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 39 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
35 // 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
36 // detaching CDMs from media players yet. See http://crbug.com/330324 41 // detaching CDMs from media players yet. See http://crbug.com/330324
37 media_player_managers_.erase(key); 42 media_player_managers_.erase(key);
43 audio_monitor_->RenderFrameDeleted(render_frame_host);
38 #endif 44 #endif
39 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager 45 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
40 // and BrowserCdmManager all run on browser UI thread. So this call is okay. 46 // 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 47 // In the future we need to support the case where MediaWebContentsObserver
42 // get notified on browser UI thread, but BrowserMediaPlayerManager and 48 // get notified on browser UI thread, but BrowserMediaPlayerManager and
43 // BrowserCdmManager run on a different thread. 49 // BrowserCdmManager run on a different thread.
44 BrowserCdmManager* browser_cdm_manager = 50 BrowserCdmManager* browser_cdm_manager =
45 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID()); 51 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID());
46 if (browser_cdm_manager) 52 if (browser_cdm_manager)
47 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID()); 53 browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());
48 } 54 }
49 55
56
50 #if defined(OS_ANDROID) 57 #if defined(OS_ANDROID)
51 58
59 bool MediaWebContentsObserver::IsAudible() const {
60 return audio_monitor_->is_audible();
61 }
62
52 bool MediaWebContentsObserver::OnMessageReceived( 63 bool MediaWebContentsObserver::OnMessageReceived(
53 const IPC::Message& msg, 64 const IPC::Message& msg,
54 RenderFrameHost* render_frame_host) { 65 RenderFrameHost* render_frame_host) {
55 if (OnMediaPlayerMessageReceived(msg, render_frame_host)) 66 if (OnMediaPlayerMessageReceived(msg, render_frame_host))
56 return true; 67 return true;
57 68
58 if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host)) 69 if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host))
59 return true; 70 return true;
60 71
61 return false; 72 return false;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 // promise. 165 // promise.
155 media_player->SetCdm(cdm); 166 media_player->SetCdm(cdm);
156 } 167 }
157 168
158 BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager( 169 BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager(
159 RenderFrameHost* render_frame_host) { 170 RenderFrameHost* render_frame_host) {
160 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 171 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
161 if (!media_player_managers_.contains(key)) { 172 if (!media_player_managers_.contains(key)) {
162 media_player_managers_.set( 173 media_player_managers_.set(
163 key, 174 key,
164 make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host))); 175 make_scoped_ptr(BrowserMediaPlayerManager::Create(
176 render_frame_host, audio_monitor_.get())));
165 } 177 }
166 return media_player_managers_.get(key); 178 return media_player_managers_.get(key);
167 } 179 }
168 180
169 #if defined(VIDEO_HOLE) 181 #if defined(VIDEO_HOLE)
170 void MediaWebContentsObserver::OnFrameInfoUpdated() { 182 void MediaWebContentsObserver::OnFrameInfoUpdated() {
171 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); 183 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();
172 iter != media_player_managers_.end(); ++iter) { 184 iter != media_player_managers_.end(); ++iter) {
173 BrowserMediaPlayerManager* manager = iter->second; 185 BrowserMediaPlayerManager* manager = iter->second;
174 manager->OnFrameInfoUpdated(); 186 manager->OnFrameInfoUpdated();
175 } 187 }
176 } 188 }
177 #endif // defined(VIDEO_HOLE) 189 #endif // defined(VIDEO_HOLE)
178 190
179 #endif // defined(OS_ANDROID) 191 #endif // defined(OS_ANDROID)
180 192
181 } // namespace content 193 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698