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

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: 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
« no previous file with comments | « content/renderer/media/android/renderer_media_player_manager.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_HANDLER(MediaPlayerMsg_RemoteRouteAvailabilityChanged, 58 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RemoteRouteAvailabilityChanged,
60 OnRemoteRouteAvailabilityChanged) 59 OnRemoteRouteAvailabilityChanged)
61 IPC_MESSAGE_UNHANDLED(handled = false) 60 IPC_MESSAGE_UNHANDLED(handled = false)
62 IPC_END_MESSAGE_MAP() 61 IPC_END_MESSAGE_MAP()
63 return handled; 62 return handled;
64 } 63 }
65 64
65 void RendererMediaPlayerManager::WasHidden() {
66 ReleaseVideoResources();
67 }
68
66 void RendererMediaPlayerManager::Initialize( 69 void RendererMediaPlayerManager::Initialize(
67 MediaPlayerHostMsg_Initialize_Type type, 70 MediaPlayerHostMsg_Initialize_Type type,
68 int player_id, 71 int player_id,
69 const GURL& url, 72 const GURL& url,
70 const GURL& first_party_for_cookies, 73 const GURL& first_party_for_cookies,
71 int demuxer_client_id, 74 int demuxer_client_id,
72 const GURL& frame_url, 75 const GURL& frame_url,
73 bool allow_credentials) { 76 bool allow_credentials) {
74 MediaPlayerHostMsg_Initialize_Params media_player_params; 77 MediaPlayerHostMsg_Initialize_Params media_player_params;
75 media_player_params.type = type; 78 media_player_params.type = type;
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 if (player) 233 if (player)
231 player->OnMediaPlayerPause(); 234 player->OnMediaPlayerPause();
232 } 235 }
233 236
234 void RendererMediaPlayerManager::OnRequestFullscreen(int player_id) { 237 void RendererMediaPlayerManager::OnRequestFullscreen(int player_id) {
235 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); 238 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
236 if (player) 239 if (player)
237 player->OnRequestFullscreen(); 240 player->OnRequestFullscreen();
238 } 241 }
239 242
240 void RendererMediaPlayerManager::OnPauseVideo() {
241 ReleaseVideoResources();
242 }
243
244 void RendererMediaPlayerManager::OnRemoteRouteAvailabilityChanged( 243 void RendererMediaPlayerManager::OnRemoteRouteAvailabilityChanged(
245 int player_id, 244 int player_id,
246 bool routes_available) { 245 bool routes_available) {
247 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); 246 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
248 if (player) 247 if (player)
249 player->OnRemoteRouteAvailabilityChanged(routes_available); 248 player->OnRemoteRouteAvailabilityChanged(routes_available);
250 } 249 }
250
251 void RendererMediaPlayerManager::EnterFullscreen(int player_id, 251 void RendererMediaPlayerManager::EnterFullscreen(int player_id,
252 blink::WebFrame* frame) { 252 blink::WebFrame* frame) {
253 pending_fullscreen_frame_ = frame; 253 pending_fullscreen_frame_ = frame;
254 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id)); 254 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
255 } 255 }
256 256
257 void RendererMediaPlayerManager::ExitFullscreen(int player_id) { 257 void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
258 pending_fullscreen_frame_ = NULL; 258 pending_fullscreen_frame_ = NULL;
259 fullscreen_frame_ = NULL; 259 fullscreen_frame_ = NULL;
260 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); 260 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 358
359 bool 359 bool
360 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { 360 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() {
361 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( 361 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>(
362 render_frame())->render_view()->renderer_preferences(); 362 render_frame())->render_view()->renderer_preferences();
363 return prefs.use_video_overlay_for_embedded_encrypted_video; 363 return prefs.use_video_overlay_for_embedded_encrypted_video;
364 } 364 }
365 #endif // defined(VIDEO_HOLE) 365 #endif // defined(VIDEO_HOLE)
366 366
367 } // namespace content 367 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/renderer_media_player_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698