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

Side by Side Diff: content/browser/media/android/browser_media_player_manager.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: sync Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser_media_player_manager.h" 5 #include "content/browser/media/android/browser_media_player_manager.h"
6 6
7 #include "base/android/scoped_java_ref.h" 7 #include "base/android/scoped_java_ref.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "content/browser/android/content_view_core_impl.h" 9 #include "content/browser/android/content_view_core_impl.h"
10 #include "content/browser/media/android/browser_demuxer_android.h" 10 #include "content/browser/media/android/browser_demuxer_android.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 if (fullscreen_player_id_ == player_id) 252 if (fullscreen_player_id_ == player_id)
253 video_view_->OnBufferingUpdate(percentage); 253 video_view_->OnBufferingUpdate(percentage);
254 } 254 }
255 255
256 void BrowserMediaPlayerManager::OnSeekRequest( 256 void BrowserMediaPlayerManager::OnSeekRequest(
257 int player_id, 257 int player_id,
258 const base::TimeDelta& time_to_seek) { 258 const base::TimeDelta& time_to_seek) {
259 Send(new MediaPlayerMsg_SeekRequest(RoutingID(), player_id, time_to_seek)); 259 Send(new MediaPlayerMsg_SeekRequest(RoutingID(), player_id, time_to_seek));
260 } 260 }
261 261
262 void BrowserMediaPlayerManager::PauseVideo() {
263 Send(new MediaPlayerMsg_PauseVideo(RoutingID()));
264 }
265
266 void BrowserMediaPlayerManager::ReleaseAllMediaPlayers() { 262 void BrowserMediaPlayerManager::ReleaseAllMediaPlayers() {
267 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); 263 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
268 it != players_.end(); ++it) { 264 it != players_.end(); ++it) {
269 if ((*it)->player_id() == fullscreen_player_id_) 265 if ((*it)->player_id() == fullscreen_player_id_)
270 fullscreen_player_is_released_ = true; 266 fullscreen_player_is_released_ = true;
271 (*it)->Release(); 267 (*it)->Release();
272 } 268 }
273 } 269 }
274 270
275 void BrowserMediaPlayerManager::OnSeekComplete( 271 void BrowserMediaPlayerManager::OnSeekComplete(
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); 604 external_video_surface_container_->ReleaseExternalVideoSurface(player_id);
609 #endif // defined(VIDEO_HOLE) 605 #endif // defined(VIDEO_HOLE)
610 } 606 }
611 607
612 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { 608 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) {
613 player->Release(); 609 player->Release();
614 ReleaseMediaResources(player->player_id()); 610 ReleaseMediaResources(player->player_id());
615 } 611 }
616 612
617 } // namespace content 613 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/android/browser_media_player_manager.h ('k') | content/browser/media/media_web_contents_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698