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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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_UNHANDLED(handled = false) | 49 IPC_MESSAGE_UNHANDLED(handled = false) |
50 IPC_END_MESSAGE_MAP() | 50 IPC_END_MESSAGE_MAP() |
51 return handled; | 51 return handled; |
52 } | 52 } |
53 | 53 |
54 void WebMediaPlayerProxyImplAndroid::Initialize( | 54 void WebMediaPlayerProxyImplAndroid::Initialize( |
55 int player_id, const GURL& url, | 55 int player_id, |
56 bool is_media_source, | 56 const GURL& url, |
| 57 media::MediaPlayerAndroid::SourceType source_type, |
57 const GURL& first_party_for_cookies) { | 58 const GURL& first_party_for_cookies) { |
58 Send(new MediaPlayerHostMsg_MediaPlayerInitialize( | 59 Send(new MediaPlayerHostMsg_MediaPlayerInitialize(routing_id(), |
59 routing_id(), player_id, url, is_media_source, first_party_for_cookies)); | 60 player_id, |
| 61 url, |
| 62 source_type, |
| 63 first_party_for_cookies)); |
60 } | 64 } |
61 | 65 |
62 void WebMediaPlayerProxyImplAndroid::Start(int player_id) { | 66 void WebMediaPlayerProxyImplAndroid::Start(int player_id) { |
63 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id)); | 67 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id)); |
64 } | 68 } |
65 | 69 |
66 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) { | 70 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) { |
67 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id)); | 71 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id)); |
68 } | 72 } |
69 | 73 |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 for (std::map<int, gfx::RectF>::iterator it = geometry_change.begin(); | 197 for (std::map<int, gfx::RectF>::iterator it = geometry_change.begin(); |
194 it != geometry_change.end(); | 198 it != geometry_change.end(); |
195 ++it) { | 199 ++it) { |
196 Send(new MediaPlayerHostMsg_NotifyExternalSurface( | 200 Send(new MediaPlayerHostMsg_NotifyExternalSurface( |
197 routing_id(), it->first, false, it->second)); | 201 routing_id(), it->first, false, it->second)); |
198 } | 202 } |
199 } | 203 } |
200 #endif | 204 #endif |
201 | 205 |
202 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( | 206 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( |
203 int player_id, media::DemuxerStream::Type type, bool seek_done) { | 207 int player_id, |
| 208 media::DemuxerStream::Type type, |
| 209 bool seek_done) { |
204 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); | 210 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); |
205 if (player) | 211 if (player) |
206 player->OnReadFromDemuxer(type, seek_done); | 212 player->OnReadFromDemuxer(type, seek_done); |
207 } | 213 } |
208 | 214 |
209 void WebMediaPlayerProxyImplAndroid::DemuxerReady( | 215 void WebMediaPlayerProxyImplAndroid::DemuxerReady( |
210 int player_id, | 216 int player_id, |
211 const media::MediaPlayerHostMsg_DemuxerReady_Params& params) { | 217 const media::MediaPlayerHostMsg_DemuxerReady_Params& params) { |
212 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); | 218 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); |
213 } | 219 } |
214 | 220 |
215 webkit_media::WebMediaPlayerAndroid* | 221 webkit_media::WebMediaPlayerAndroid* |
216 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { | 222 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { |
217 return static_cast<webkit_media::WebMediaPlayerAndroid*>( | 223 return static_cast<webkit_media::WebMediaPlayerAndroid*>( |
218 manager_->GetMediaPlayer(player_id)); | 224 manager_->GetMediaPlayer(player_id)); |
219 } | 225 } |
220 | 226 |
221 void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest( | 227 void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest( |
222 int player_id, base::TimeDelta time_to_seek, bool request_texture_peer) { | 228 int player_id, base::TimeDelta time_to_seek, bool request_texture_peer) { |
223 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); | 229 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); |
224 if (player) { | 230 if (player) { |
225 Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id)); | 231 Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id)); |
226 player->OnMediaSeekRequest(time_to_seek, request_texture_peer); | 232 player->OnMediaSeekRequest(time_to_seek, request_texture_peer); |
227 } | 233 } |
228 } | 234 } |
229 | 235 |
230 | 236 |
231 } // namespace content | 237 } // namespace content |
OLD | NEW |