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

Side by Side Diff: content/renderer/media/android/renderer_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: 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 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/renderer/media/android/renderer_media_player_manager.h" 5 #include "content/renderer/media/android/renderer_media_player_manager.h"
6 6
7 #include "content/common/media/media_player_messages_android.h" 7 #include "content/common/media/media_player_messages_android.h"
8 #include "content/public/common/renderer_preferences.h" 8 #include "content/public/common/renderer_preferences.h"
9 #include "content/renderer/media/android/renderer_media_player_manager.h" 9 #include "content/renderer/media/android/renderer_media_player_manager.h"
10 #include "content/renderer/media/android/webmediaplayer_android.h" 10 #include "content/renderer/media/android/webmediaplayer_android.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice, 48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice,
49 OnConnectedToRemoteDevice) 49 OnConnectedToRemoteDevice)
50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice, 50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice,
51 OnDisconnectedFromRemoteDevice) 51 OnDisconnectedFromRemoteDevice)
52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RequestFullscreen, 52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RequestFullscreen,
53 OnRequestFullscreen) 53 OnRequestFullscreen)
54 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen) 54 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen)
55 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) 55 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
56 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) 56 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay)
57 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) 57 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
58 IPC_MESSAGE_HANDLER(MediaPlayerMsg_PauseVideo, OnPauseVideo)
59 IPC_MESSAGE_UNHANDLED(handled = false) 58 IPC_MESSAGE_UNHANDLED(handled = false)
60 IPC_END_MESSAGE_MAP() 59 IPC_END_MESSAGE_MAP()
61 return handled; 60 return handled;
62 } 61 }
63 62
63 void RendererMediaPlayerManager::WasHidden() {
64 ReleaseVideoResources();
xhwang 2014/09/24 22:52:40 I like the idea of this CL. But I am not sure how
michaelbai 2014/09/24 23:24:08 Frankly speaking, I just moved ReleaseVideoResourc
65 }
66
64 void RendererMediaPlayerManager::Initialize( 67 void RendererMediaPlayerManager::Initialize(
65 MediaPlayerHostMsg_Initialize_Type type, 68 MediaPlayerHostMsg_Initialize_Type type,
66 int player_id, 69 int player_id,
67 const GURL& url, 70 const GURL& url,
68 const GURL& first_party_for_cookies, 71 const GURL& first_party_for_cookies,
69 int demuxer_client_id, 72 int demuxer_client_id,
70 const GURL& frame_url, 73 const GURL& frame_url,
71 bool allow_credentials) { 74 bool allow_credentials) {
72 MediaPlayerHostMsg_Initialize_Params media_player_params; 75 MediaPlayerHostMsg_Initialize_Params media_player_params;
73 media_player_params.type = type; 76 media_player_params.type = type;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 if (player) 222 if (player)
220 player->OnMediaPlayerPause(); 223 player->OnMediaPlayerPause();
221 } 224 }
222 225
223 void RendererMediaPlayerManager::OnRequestFullscreen(int player_id) { 226 void RendererMediaPlayerManager::OnRequestFullscreen(int player_id) {
224 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); 227 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
225 if (player) 228 if (player)
226 player->OnRequestFullscreen(); 229 player->OnRequestFullscreen();
227 } 230 }
228 231
229 void RendererMediaPlayerManager::OnPauseVideo() {
230 ReleaseVideoResources();
231 }
232
233 void RendererMediaPlayerManager::EnterFullscreen(int player_id, 232 void RendererMediaPlayerManager::EnterFullscreen(int player_id,
234 blink::WebFrame* frame) { 233 blink::WebFrame* frame) {
235 pending_fullscreen_frame_ = frame; 234 pending_fullscreen_frame_ = frame;
236 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id)); 235 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
237 } 236 }
238 237
239 void RendererMediaPlayerManager::ExitFullscreen(int player_id) { 238 void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
240 pending_fullscreen_frame_ = NULL; 239 pending_fullscreen_frame_ = NULL;
241 fullscreen_frame_ = NULL; 240 fullscreen_frame_ = NULL;
242 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); 241 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 339
341 bool 340 bool
342 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { 341 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() {
343 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( 342 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>(
344 render_frame())->render_view()->renderer_preferences(); 343 render_frame())->render_view()->renderer_preferences();
345 return prefs.use_video_overlay_for_embedded_encrypted_video; 344 return prefs.use_video_overlay_for_embedded_encrypted_video;
346 } 345 }
347 #endif // defined(VIDEO_HOLE) 346 #endif // defined(VIDEO_HOLE)
348 347
349 } // namespace content 348 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698