| OLD | NEW |
| 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 25 matching lines...) Expand all Loading... |
| 36 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlaybackCompleted, | 36 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlaybackCompleted, |
| 37 OnMediaPlaybackCompleted) | 37 OnMediaPlaybackCompleted) |
| 38 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaBufferingUpdate, | 38 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaBufferingUpdate, |
| 39 OnMediaBufferingUpdate) | 39 OnMediaBufferingUpdate) |
| 40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_SeekRequest, OnSeekRequest) | 40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_SeekRequest, OnSeekRequest) |
| 41 IPC_MESSAGE_HANDLER(MediaPlayerMsg_SeekCompleted, OnSeekCompleted) | 41 IPC_MESSAGE_HANDLER(MediaPlayerMsg_SeekCompleted, OnSeekCompleted) |
| 42 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaError, OnMediaError) | 42 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaError, OnMediaError) |
| 43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaVideoSizeChanged, | 43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaVideoSizeChanged, |
| 44 OnVideoSizeChanged) | 44 OnVideoSizeChanged) |
| 45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) | 45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) |
| 46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_WaitingForDecryptionKey, | |
| 47 OnWaitingForDecryptionKey) | |
| 48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, | 46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, |
| 49 OnMediaPlayerReleased) | 47 OnMediaPlayerReleased) |
| 50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice, | 48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice, |
| 51 OnConnectedToRemoteDevice) | 49 OnConnectedToRemoteDevice) |
| 52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice, | 50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice, |
| 53 OnDisconnectedFromRemoteDevice) | 51 OnDisconnectedFromRemoteDevice) |
| 54 IPC_MESSAGE_HANDLER(MediaPlayerMsg_CancelledRemotePlaybackRequest, | 52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_CancelledRemotePlaybackRequest, |
| 55 OnCancelledRemotePlaybackRequest) | 53 OnCancelledRemotePlaybackRequest) |
| 56 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) | 54 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) |
| 57 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) | 55 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) |
| 58 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) | 56 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) |
| 59 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RemoteRouteAvailabilityChanged, | 57 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RemoteRouteAvailabilityChanged, |
| 60 OnRemoteRouteAvailabilityChanged) | 58 OnRemoteRouteAvailabilityChanged) |
| 61 IPC_MESSAGE_UNHANDLED(handled = false) | 59 IPC_MESSAGE_UNHANDLED(handled = false) |
| 62 IPC_END_MESSAGE_MAP() | 60 IPC_END_MESSAGE_MAP() |
| 63 return handled; | 61 return handled; |
| 64 } | 62 } |
| 65 | 63 |
| 66 void RendererMediaPlayerManager::Initialize( | 64 void RendererMediaPlayerManager::Initialize( |
| 67 MediaPlayerHostMsg_Initialize_Type type, | 65 MediaPlayerHostMsg_Initialize_Type type, |
| 68 int player_id, | 66 int player_id, |
| 69 const GURL& url, | 67 const GURL& url, |
| 70 const GURL& first_party_for_cookies, | 68 const GURL& first_party_for_cookies, |
| 71 int demuxer_client_id, | |
| 72 const GURL& frame_url, | 69 const GURL& frame_url, |
| 73 bool allow_credentials, | 70 bool allow_credentials, |
| 74 int delegate_id) { | 71 int delegate_id) { |
| 75 MediaPlayerHostMsg_Initialize_Params media_player_params; | 72 MediaPlayerHostMsg_Initialize_Params media_player_params; |
| 76 media_player_params.type = type; | 73 media_player_params.type = type; |
| 77 media_player_params.player_id = player_id; | 74 media_player_params.player_id = player_id; |
| 78 media_player_params.demuxer_client_id = demuxer_client_id; | |
| 79 media_player_params.url = url; | 75 media_player_params.url = url; |
| 80 media_player_params.first_party_for_cookies = first_party_for_cookies; | 76 media_player_params.first_party_for_cookies = first_party_for_cookies; |
| 81 media_player_params.frame_url = frame_url; | 77 media_player_params.frame_url = frame_url; |
| 82 media_player_params.allow_credentials = allow_credentials; | 78 media_player_params.allow_credentials = allow_credentials; |
| 83 media_player_params.delegate_id = delegate_id; | 79 media_player_params.delegate_id = delegate_id; |
| 84 | 80 |
| 85 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); | 81 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); |
| 86 } | 82 } |
| 87 | 83 |
| 88 void RendererMediaPlayerManager::Start(int player_id) { | 84 void RendererMediaPlayerManager::Start(int player_id) { |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 179 |
| 184 void RendererMediaPlayerManager::OnTimeUpdate( | 180 void RendererMediaPlayerManager::OnTimeUpdate( |
| 185 int player_id, | 181 int player_id, |
| 186 base::TimeDelta current_timestamp, | 182 base::TimeDelta current_timestamp, |
| 187 base::TimeTicks current_time_ticks) { | 183 base::TimeTicks current_time_ticks) { |
| 188 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); | 184 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); |
| 189 if (player) | 185 if (player) |
| 190 player->OnTimeUpdate(current_timestamp, current_time_ticks); | 186 player->OnTimeUpdate(current_timestamp, current_time_ticks); |
| 191 } | 187 } |
| 192 | 188 |
| 193 void RendererMediaPlayerManager::OnWaitingForDecryptionKey(int player_id) { | |
| 194 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); | |
| 195 if (player) | |
| 196 player->OnWaitingForDecryptionKey(); | |
| 197 } | |
| 198 | |
| 199 void RendererMediaPlayerManager::OnMediaPlayerReleased(int player_id) { | 189 void RendererMediaPlayerManager::OnMediaPlayerReleased(int player_id) { |
| 200 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); | 190 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); |
| 201 if (player) | 191 if (player) |
| 202 player->OnPlayerReleased(); | 192 player->OnPlayerReleased(); |
| 203 } | 193 } |
| 204 | 194 |
| 205 void RendererMediaPlayerManager::OnConnectedToRemoteDevice(int player_id, | 195 void RendererMediaPlayerManager::OnConnectedToRemoteDevice(int player_id, |
| 206 const std::string& remote_playback_message) { | 196 const std::string& remote_playback_message) { |
| 207 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); | 197 media::RendererMediaPlayerInterface* player = GetMediaPlayer(player_id); |
| 208 if (player) | 198 if (player) |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 if (iter != media_players_.end()) | 267 if (iter != media_players_.end()) |
| 278 return iter->second; | 268 return iter->second; |
| 279 return NULL; | 269 return NULL; |
| 280 } | 270 } |
| 281 | 271 |
| 282 void RendererMediaPlayerManager::OnDestruct() { | 272 void RendererMediaPlayerManager::OnDestruct() { |
| 283 delete this; | 273 delete this; |
| 284 } | 274 } |
| 285 | 275 |
| 286 } // namespace content | 276 } // namespace content |
| OLD | NEW |