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

Side by Side Diff: content/renderer/media/android/renderer_media_player_manager.cc

Issue 1829923003: [Android,RemotePlayback] Resolve HTMLMediaElement.remote.connect() with false when device is not se… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remote-playback-connect
Patch Set: Rebased Created 4 years, 8 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/common/media/media_player_messages_android.h" 8 #include "content/common/media/media_player_messages_android.h"
9 #include "content/public/common/renderer_preferences.h" 9 #include "content/public/common/renderer_preferences.h"
10 #include "content/renderer/media/android/webmediaplayer_android.h" 10 #include "content/renderer/media/android/webmediaplayer_android.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 OnVideoSizeChanged) 44 OnVideoSizeChanged)
45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) 45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate)
46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_WaitingForDecryptionKey, 46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_WaitingForDecryptionKey,
47 OnWaitingForDecryptionKey) 47 OnWaitingForDecryptionKey)
48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, 48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased,
49 OnMediaPlayerReleased) 49 OnMediaPlayerReleased)
50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice, 50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice,
51 OnConnectedToRemoteDevice) 51 OnConnectedToRemoteDevice)
52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice, 52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice,
53 OnDisconnectedFromRemoteDevice) 53 OnDisconnectedFromRemoteDevice)
54 IPC_MESSAGE_HANDLER(MediaPlayerMsg_CancelledRemotePlaybackRequest,
55 OnCancelledRemotePlaybackRequest)
54 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) 56 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
55 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) 57 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay)
56 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) 58 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
57 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RemoteRouteAvailabilityChanged, 59 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RemoteRouteAvailabilityChanged,
58 OnRemoteRouteAvailabilityChanged) 60 OnRemoteRouteAvailabilityChanged)
59 IPC_MESSAGE_UNHANDLED(handled = false) 61 IPC_MESSAGE_UNHANDLED(handled = false)
60 IPC_END_MESSAGE_MAP() 62 IPC_END_MESSAGE_MAP()
61 return handled; 63 return handled;
62 } 64 }
63 65
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 if (player) 210 if (player)
209 player->OnConnectedToRemoteDevice(remote_playback_message); 211 player->OnConnectedToRemoteDevice(remote_playback_message);
210 } 212 }
211 213
212 void RendererMediaPlayerManager::OnDisconnectedFromRemoteDevice(int player_id) { 214 void RendererMediaPlayerManager::OnDisconnectedFromRemoteDevice(int player_id) {
213 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); 215 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
214 if (player) 216 if (player)
215 player->OnDisconnectedFromRemoteDevice(); 217 player->OnDisconnectedFromRemoteDevice();
216 } 218 }
217 219
220 void RendererMediaPlayerManager::OnCancelledRemotePlaybackRequest(
221 int player_id) {
222 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
223 if (player)
224 player->OnCancelledRemotePlaybackRequest();
225 }
226
218 void RendererMediaPlayerManager::OnDidExitFullscreen(int player_id) { 227 void RendererMediaPlayerManager::OnDidExitFullscreen(int player_id) {
219 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); 228 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
220 if (player) 229 if (player)
221 player->OnDidExitFullscreen(); 230 player->OnDidExitFullscreen();
222 } 231 }
223 232
224 void RendererMediaPlayerManager::OnPlayerPlay(int player_id) { 233 void RendererMediaPlayerManager::OnPlayerPlay(int player_id) {
225 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); 234 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
226 if (player) 235 if (player)
227 player->OnMediaPlayerPlay(); 236 player->OnMediaPlayerPlay();
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 318
310 bool 319 bool
311 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { 320 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() {
312 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( 321 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>(
313 render_frame())->render_view()->renderer_preferences(); 322 render_frame())->render_view()->renderer_preferences();
314 return prefs.use_video_overlay_for_embedded_encrypted_video; 323 return prefs.use_video_overlay_for_embedded_encrypted_video;
315 } 324 }
316 #endif // defined(VIDEO_HOLE) 325 #endif // defined(VIDEO_HOLE)
317 326
318 } // namespace content 327 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698