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

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: combined KeyHandlingDemxuer w/ KeyHandlingChunkDemuxer 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::MediaPlayerBridge::MediaSource media_source,
58 const GURL& first_party_for_cookies) { 59 const GURL& first_party_for_cookies) {
59 Send(new MediaPlayerHostMsg_MediaPlayerInitialize( 60 Send(new MediaPlayerHostMsg_MediaPlayerInitialize(
60 routing_id(), player_id, url, is_media_source, first_party_for_cookies)); 61 routing_id(), player_id, url, media_source, first_party_for_cookies));
61 } 62 }
62 63
63 void WebMediaPlayerProxyImplAndroid::Start(int player_id) { 64 void WebMediaPlayerProxyImplAndroid::Start(int player_id) {
64 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id)); 65 Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id));
65 } 66 }
66 67
67 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) { 68 void WebMediaPlayerProxyImplAndroid::Pause(int player_id) {
68 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id)); 69 Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id));
69 } 70 }
70 71
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); 198 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params));
198 } 199 }
199 200
200 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck( 201 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck(
201 int player_id, 202 int player_id,
202 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { 203 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
203 Send(new MediaPlayerHostMsg_ReadFromDemuxerAck( 204 Send(new MediaPlayerHostMsg_ReadFromDemuxerAck(
204 routing_id(), player_id, params)); 205 routing_id(), player_id, params));
205 206
206 } 207 }
208
207 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( 209 void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer(
208 int player_id, media::DemuxerStream::Type type, bool seek_done) { 210 int player_id, media::DemuxerStream::Type type, bool seek_done) {
209 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); 211 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
210 if (player) 212 if (player)
211 player->OnReadFromDemuxer(type, seek_done); 213 player->OnReadFromDemuxer(type, seek_done);
212 } 214 }
213 #endif 215 #endif
214 216
215 webkit_media::WebMediaPlayerAndroid* 217 webkit_media::WebMediaPlayerAndroid*
216 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { 218 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) {
217 return static_cast<webkit_media::WebMediaPlayerAndroid*>( 219 return static_cast<webkit_media::WebMediaPlayerAndroid*>(
218 manager_->GetMediaPlayer(player_id)); 220 manager_->GetMediaPlayer(player_id));
219 } 221 }
220 222
221 } // namespace content 223 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698