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

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: refactored according to Ami's suggestion 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"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) 46 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
47 #if defined(GOOGLE_TV) 47 #if defined(GOOGLE_TV)
48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer) 48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer)
49 #endif 49 #endif
50 IPC_MESSAGE_UNHANDLED(handled = false) 50 IPC_MESSAGE_UNHANDLED(handled = false)
51 IPC_END_MESSAGE_MAP() 51 IPC_END_MESSAGE_MAP()
52 return handled; 52 return handled;
53 } 53 }
54 54
55 void WebMediaPlayerProxyImplAndroid::Initialize( 55 void WebMediaPlayerProxyImplAndroid::Initialize(
56 int player_id, const GURL& url, 56 int player_id,
57 bool is_media_source, 57 const GURL& url,
58 media::MediaPlayerAndroid::MediaSourceType media_source_type,
58 const GURL& first_party_for_cookies) { 59 const GURL& first_party_for_cookies) {
59 Send(new MediaPlayerHostMsg_MediaPlayerInitialize( 60 Send(new MediaPlayerHostMsg_MediaPlayerInitialize(routing_id(),
60 routing_id(), player_id, url, is_media_source, first_party_for_cookies)); 61 player_id,
62 url,
63 media_source_type,
64 first_party_for_cookies));
61 } 65 }
62 66
63 void WebMediaPlayerProxyImplAndroid::Start(int player_id) { 67 void WebMediaPlayerProxyImplAndroid::Start(int player_id) {
64 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id)); 68 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id));
65 } 69 }
66 70
67 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) { 71 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) {
68 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id)); 72 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id));
69 } 73 }
70 74
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); 202 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params));
199 } 203 }
200 204
201 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck( 205 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck(
202 int player_id, 206 int player_id,
203 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { 207 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
204 Send(new MediaPlayerHostMsg_ReadFromDemuxerAck( 208 Send(new MediaPlayerHostMsg_ReadFromDemuxerAck(
205 routing_id(), player_id, params)); 209 routing_id(), player_id, params));
206 210
207 } 211 }
212
208 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( 213 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer(
209 int player_id, media::DemuxerStream::Type type, bool seek_done) { 214 int player_id, media::DemuxerStream::Type type, bool seek_done) {
210 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); 215 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
211 if (player) 216 if (player)
212 player->OnReadFromDemuxer(type, seek_done); 217 player->OnReadFromDemuxer(type, seek_done);
213 } 218 }
214 #endif 219 #endif
215 220
216 webkit_media::WebMediaPlayerAndroid* 221 webkit_media::WebMediaPlayerAndroid*
217 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { 222 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) {
218 return static_cast<webkit_media::WebMediaPlayerAndroid*>( 223 return static_cast<webkit_media::WebMediaPlayerAndroid*>(
219 manager_->GetMediaPlayer(player_id)); 224 manager_->GetMediaPlayer(player_id));
220 } 225 }
221 226
222 } // namespace content 227 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698