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

Unified Diff: content/renderer/media/android/renderer_media_player_manager.cc

Issue 103583005: Restart fullscreen video playback when switching back from background (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/android/renderer_media_player_manager.cc
diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
index d75a7e3656f473e421291e9ed97c5f31cde4a297..e5037a2f02ff58d960c567d6f31461b48e68db33 100644
--- a/content/renderer/media/android/renderer_media_player_manager.cc
+++ b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -17,6 +17,8 @@ namespace content {
RendererMediaPlayerManager::RendererMediaPlayerManager(RenderView* render_view)
: RenderViewObserver(render_view),
next_media_player_id_(0),
+ fullscreen_player_id_(-1),
+ paused_fullscreen_player_id_(-1),
fullscreen_frame_(NULL) {}
RendererMediaPlayerManager::~RendererMediaPlayerManager() {
@@ -188,14 +190,18 @@ void RendererMediaPlayerManager::OnDisconnectedFromRemoteDevice(int player_id) {
void RendererMediaPlayerManager::OnDidEnterFullscreen(int player_id) {
WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
- if (player)
+ if (player) {
+ fullscreen_player_id_ = player_id;
player->OnDidEnterFullscreen();
+ }
}
void RendererMediaPlayerManager::OnDidExitFullscreen(int player_id) {
WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
- if (player)
+ if (player) {
+ fullscreen_player_id_ = -1;
player->OnDidExitFullscreen();
+ }
}
void RendererMediaPlayerManager::OnPlayerPlay(int player_id) {
@@ -221,6 +227,7 @@ void RendererMediaPlayerManager::EnterFullscreen(int player_id) {
}
void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
+ DCHECK(player_id == fullscreen_player_id_);
Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
}
@@ -323,7 +330,12 @@ void RendererMediaPlayerManager::RegisterMediaKeys(int media_keys_id,
media_keys_[media_keys_id] = media_keys;
}
-void RendererMediaPlayerManager::ReleaseVideoResources() {
qinmin 2013/12/05 23:02:34 I don't think this is right. This function is not
kbalazs 2013/12/05 23:36:22 I think you misread it, there is no early return f
qinmin 2013/12/06 00:10:13 ah...sorry, i thought you were removing the origin
kbalazs 2013/12/06 19:15:03 Done, I moved the new code into SuspendFullscreenV
+void RendererMediaPlayerManager::PauseVideo() {
+ if (fullscreen_player_id_ != -1) {
+ ExitFullscreen(fullscreen_player_id_);
+ paused_fullscreen_player_id_ = fullscreen_player_id_;
+ }
+
std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
for (player_it = media_players_.begin();
player_it != media_players_.end(); ++player_it) {
@@ -335,6 +347,13 @@ void RendererMediaPlayerManager::ReleaseVideoResources() {
}
}
+void RendererMediaPlayerManager::ResumeVideo() {
+ if (paused_fullscreen_player_id_ != -1) {
+ EnterFullscreen(paused_fullscreen_player_id_);
+ paused_fullscreen_player_id_ = -1;
+ }
+}
+
WebMediaPlayerAndroid* RendererMediaPlayerManager::GetMediaPlayer(
int player_id) {
std::map<int, WebMediaPlayerAndroid*>::iterator iter =

Powered by Google App Engine
This is Rietveld 408576698