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

Side by Side Diff: content/renderer/media/webmediaplayer_proxy_impl_android.cc

Issue 14247018: Implement WebRTC in Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed some comments Created 7 years, 7 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 (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
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,
57 bool is_media_source, 61 const GURL& url,
62 media::MediaPlayerBridge::MediaType media_type,
58 const GURL& first_party_for_cookies) { 63 const GURL& first_party_for_cookies) {
59 Send(new MediaPlayerHostMsg_MediaPlayerInitialize( 64 Send(new MediaPlayerHostMsg_MediaPlayerInitialize(
60 routing_id(), player_id, url, is_media_source, first_party_for_cookies)); 65 routing_id(), player_id, url, media_type, first_party_for_cookies));
61 } 66 }
62 67
63 void WebMediaPlayerProxyImplAndroid::Start(int player_id) { 68 void WebMediaPlayerProxyImplAndroid::Start(int player_id) {
64 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id)); 69 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id));
65 } 70 }
66 71
67 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) { 72 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) {
68 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id)); 73 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id));
69 } 74 }
70 75
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); 202 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params));
198 } 203 }
199 204
200 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck( 205 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck(
201 int player_id, 206 int player_id,
202 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { 207 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
203 Send(new MediaPlayerHostMsg_ReadFromDemuxerAck( 208 Send(new MediaPlayerHostMsg_ReadFromDemuxerAck(
204 routing_id(), player_id, params)); 209 routing_id(), player_id, params));
205 210
206 } 211 }
212
207 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( 213 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer(
208 int player_id, media::DemuxerStream::Type type, bool seek_done) { 214 int player_id, media::DemuxerStream::Type type, bool seek_done) {
209 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); 215 webkit_media::WebMediaPlayerTv* player =
216 static_cast<webkit_media::WebMediaPlayerTv*>(
ycheo (away) 2013/05/02 02:45:21 dynamic_cast?
wonsik 2013/05/02 15:22:00 Not permitted (-fno-rtti), and not applicable afte
217 manager_->GetMediaPlayer(player_id));
210 if (player) 218 if (player)
211 player->OnReadFromDemuxer(type, seek_done); 219 player->OnReadFromDemuxer(type, seek_done);
212 } 220 }
213 #endif 221 #endif
214 222
215 webkit_media::WebMediaPlayerAndroid* 223 webkit_media::WebMediaPlayerAndroid*
216 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { 224 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) {
217 return static_cast<webkit_media::WebMediaPlayerAndroid*>( 225 return static_cast<webkit_media::WebMediaPlayerAndroid*>(
218 manager_->GetMediaPlayer(player_id)); 226 manager_->GetMediaPlayer(player_id));
219 } 227 }
220 228
221 } // namespace content 229 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698