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

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

Issue 570183002: Make the pause of video playback and video capture consistent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: also make video playback consistent Created 6 years, 3 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/common/media/cdm_messages.h" 10 #include "content/common/media/cdm_messages.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 RenderFrameHost* render_frame_host) { 176 RenderFrameHost* render_frame_host) {
177 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 177 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
178 if (!media_player_managers_.contains(key)) { 178 if (!media_player_managers_.contains(key)) {
179 media_player_managers_.set( 179 media_player_managers_.set(
180 key, 180 key,
181 make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host))); 181 make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host)));
182 } 182 }
183 return media_player_managers_.get(key); 183 return media_player_managers_.get(key);
184 } 184 }
185 185
186 void MediaWebContentsObserver::PauseVideo() {
187 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();
188 iter != media_player_managers_.end(); ++iter) {
189 BrowserMediaPlayerManager* manager = iter->second;
190 manager->PauseVideo();
191 }
192 }
193
194 #if defined(VIDEO_HOLE) 186 #if defined(VIDEO_HOLE)
195 void MediaWebContentsObserver::OnFrameInfoUpdated() { 187 void MediaWebContentsObserver::OnFrameInfoUpdated() {
196 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); 188 for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();
197 iter != media_player_managers_.end(); ++iter) { 189 iter != media_player_managers_.end(); ++iter) {
198 BrowserMediaPlayerManager* manager = iter->second; 190 BrowserMediaPlayerManager* manager = iter->second;
199 manager->OnFrameInfoUpdated(); 191 manager->OnFrameInfoUpdated();
200 } 192 }
201 } 193 }
202 #endif // defined(VIDEO_HOLE) 194 #endif // defined(VIDEO_HOLE)
203 195
204 #endif // defined(OS_ANDROID) 196 #endif // defined(OS_ANDROID)
205 197
206 } // namespace content 198 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698