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.h" | 9 #include "content/common/media/media_player_messages.h" |
10 #include "webkit/media/android/webmediaplayer_android.h" | 10 #include "webkit/media/android/webmediaplayer_android.h" |
11 #include "webkit/media/android/webmediaplayer_manager_android.h" | 11 #include "webkit/media/android/webmediaplayer_manager_android.h" |
12 | 12 |
| 13 #if defined(GOOGLE_TV) |
| 14 #include "webkit/media/android/webmediaplayer_tv.h" |
| 15 #endif |
| 16 |
13 namespace content { | 17 namespace content { |
14 | 18 |
15 WebMediaPlayerProxyImplAndroid::WebMediaPlayerProxyImplAndroid( | 19 WebMediaPlayerProxyImplAndroid::WebMediaPlayerProxyImplAndroid( |
16 RenderView* render_view, | 20 RenderView* render_view, |
17 webkit_media::WebMediaPlayerManagerAndroid* manager) | 21 webkit_media::WebMediaPlayerManagerAndroid* manager) |
18 : RenderViewObserver(render_view), | 22 : RenderViewObserver(render_view), |
19 manager_(manager) { | 23 manager_(manager) { |
20 } | 24 } |
21 | 25 |
22 WebMediaPlayerProxyImplAndroid::~WebMediaPlayerProxyImplAndroid() { | 26 WebMediaPlayerProxyImplAndroid::~WebMediaPlayerProxyImplAndroid() { |
(...skipping 23 matching lines...) Expand all Loading... |
46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) | 50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) |
47 #if defined(GOOGLE_TV) | 51 #if defined(GOOGLE_TV) |
48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer) | 52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer) |
49 #endif | 53 #endif |
50 IPC_MESSAGE_UNHANDLED(handled = false) | 54 IPC_MESSAGE_UNHANDLED(handled = false) |
51 IPC_END_MESSAGE_MAP() | 55 IPC_END_MESSAGE_MAP() |
52 return handled; | 56 return handled; |
53 } | 57 } |
54 | 58 |
55 void WebMediaPlayerProxyImplAndroid::Initialize( | 59 void WebMediaPlayerProxyImplAndroid::Initialize( |
56 int player_id, const GURL& url, | 60 int player_id, const GURL& url, int flags, |
57 bool is_media_source, | |
58 const GURL& first_party_for_cookies) { | 61 const GURL& first_party_for_cookies) { |
59 Send(new MediaPlayerHostMsg_MediaPlayerInitialize( | 62 Send(new MediaPlayerHostMsg_MediaPlayerInitialize( |
60 routing_id(), player_id, url, is_media_source, first_party_for_cookies)); | 63 routing_id(), player_id, url, flags, first_party_for_cookies)); |
61 } | 64 } |
62 | 65 |
63 void WebMediaPlayerProxyImplAndroid::Start(int player_id) { | 66 void WebMediaPlayerProxyImplAndroid::Start(int player_id) { |
64 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id)); | 67 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id)); |
65 } | 68 } |
66 | 69 |
67 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) { | 70 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) { |
68 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id)); | 71 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id)); |
69 } | 72 } |
70 | 73 |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); | 200 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); |
198 } | 201 } |
199 | 202 |
200 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck( | 203 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck( |
201 int player_id, | 204 int player_id, |
202 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { | 205 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { |
203 Send(new MediaPlayerHostMsg_ReadFromDemuxerAck( | 206 Send(new MediaPlayerHostMsg_ReadFromDemuxerAck( |
204 routing_id(), player_id, params)); | 207 routing_id(), player_id, params)); |
205 | 208 |
206 } | 209 } |
| 210 |
207 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( | 211 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( |
208 int player_id, media::DemuxerStream::Type type, bool seek_done) { | 212 int player_id, media::DemuxerStream::Type type, bool seek_done) { |
209 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); | 213 webkit_media::WebMediaPlayerTv* player = |
| 214 static_cast<webkit_media::WebMediaPlayerTv*>( |
| 215 manager_->GetMediaPlayer(player_id)); |
210 if (player) | 216 if (player) |
211 player->OnReadFromDemuxer(type, seek_done); | 217 player->OnReadFromDemuxer(type, seek_done); |
212 } | 218 } |
213 #endif | 219 #endif |
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 } // namespace content | 227 } // namespace content |
OLD | NEW |