OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/webmediaplayer_proxy_impl_android.h" | 5 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "content/common/media/media_player_messages_android.h" | 9 #include "content/common/media/media_player_messages_android.h" |
10 #include "webkit/renderer/media/android/webmediaplayer_android.h" | 10 #include "webkit/renderer/media/android/webmediaplayer_android.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 OnVideoSizeChanged) | 39 OnVideoSizeChanged) |
40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) | 40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) |
41 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, | 41 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, |
42 OnMediaPlayerReleased) | 42 OnMediaPlayerReleased) |
43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen) | 43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen) |
44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) | 44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) |
45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) | 45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) |
46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) | 46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) |
47 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer) | 47 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer) |
48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekRequest, OnMediaSeekRequest) | 48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekRequest, OnMediaSeekRequest) |
| 49 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest) |
49 IPC_MESSAGE_UNHANDLED(handled = false) | 50 IPC_MESSAGE_UNHANDLED(handled = false) |
50 IPC_END_MESSAGE_MAP() | 51 IPC_END_MESSAGE_MAP() |
51 return handled; | 52 return handled; |
52 } | 53 } |
53 | 54 |
54 void WebMediaPlayerProxyImplAndroid::Initialize( | 55 void WebMediaPlayerProxyImplAndroid::Initialize( |
55 int player_id, const GURL& url, | 56 int player_id, const GURL& url, |
56 bool is_media_source, | 57 bool is_media_source, |
57 const GURL& first_party_for_cookies) { | 58 const GURL& first_party_for_cookies) { |
58 Send(new MediaPlayerHostMsg_MediaPlayerInitialize( | 59 Send(new MediaPlayerHostMsg_MediaPlayerInitialize( |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); | 213 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); |
213 } | 214 } |
214 | 215 |
215 webkit_media::WebMediaPlayerAndroid* | 216 webkit_media::WebMediaPlayerAndroid* |
216 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { | 217 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { |
217 return static_cast<webkit_media::WebMediaPlayerAndroid*>( | 218 return static_cast<webkit_media::WebMediaPlayerAndroid*>( |
218 manager_->GetMediaPlayer(player_id)); | 219 manager_->GetMediaPlayer(player_id)); |
219 } | 220 } |
220 | 221 |
221 void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest( | 222 void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest( |
222 int player_id, base::TimeDelta time_to_seek, bool request_texture_peer) { | 223 int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) { |
223 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); | 224 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); |
224 if (player) { | 225 if (player) { |
225 Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id)); | 226 Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id, |
226 player->OnMediaSeekRequest(time_to_seek, request_texture_peer); | 227 seek_request_id)); |
| 228 player->OnMediaSeekRequest(time_to_seek); |
227 } | 229 } |
228 } | 230 } |
229 | 231 |
| 232 void WebMediaPlayerProxyImplAndroid::OnMediaConfigRequest(int player_id) { |
| 233 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); |
| 234 if (player) |
| 235 player->OnMediaConfigRequest(); |
| 236 } |
230 | 237 |
231 } // namespace content | 238 } // namespace content |
OLD | NEW |