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

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

Issue 16098014: Handle config changes for MSE on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
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_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 28 matching lines...) Expand all
39 OnVideoSizeChanged) 39 OnVideoSizeChanged)
40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) 40 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate)
41 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, 41 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased,
42 OnMediaPlayerReleased) 42 OnMediaPlayerReleased)
43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen) 43 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen)
44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) 44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
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_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest)
49 IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyAdded, OnKeyAdded) 50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyAdded, OnKeyAdded)
50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyError, OnKeyError) 51 IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyError, OnKeyError)
51 IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyMessage, OnKeyMessage) 52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyMessage, OnKeyMessage)
52 IPC_MESSAGE_UNHANDLED(handled = false) 53 IPC_MESSAGE_UNHANDLED(handled = false)
53 IPC_END_MESSAGE_MAP() 54 IPC_END_MESSAGE_MAP()
54 return handled; 55 return handled;
55 } 56 }
56 57
57 void WebMediaPlayerProxyImplAndroid::Initialize( 58 void WebMediaPlayerProxyImplAndroid::Initialize(
58 int player_id, 59 int player_id,
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params)); 243 Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params));
243 } 244 }
244 245
245 webkit_media::WebMediaPlayerAndroid* 246 webkit_media::WebMediaPlayerAndroid*
246 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) { 247 WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) {
247 return static_cast<webkit_media::WebMediaPlayerAndroid*>( 248 return static_cast<webkit_media::WebMediaPlayerAndroid*>(
248 manager_->GetMediaPlayer(player_id)); 249 manager_->GetMediaPlayer(player_id));
249 } 250 }
250 251
251 void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest( 252 void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest(
252 int player_id, base::TimeDelta time_to_seek, bool request_texture_peer) { 253 int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) {
253 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); 254 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
254 if (player) { 255 if (player) {
255 Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id)); 256 Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id,
256 player->OnMediaSeekRequest(time_to_seek, request_texture_peer); 257 seek_request_id));
258 player->OnMediaSeekRequest(time_to_seek);
257 } 259 }
258 } 260 }
259 261
262 void WebMediaPlayerProxyImplAndroid::OnMediaConfigRequest(int player_id) {
263 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
264 if (player)
265 player->OnMediaConfigRequest();
266 }
267
260 void WebMediaPlayerProxyImplAndroid::OnKeyAdded(int player_id, 268 void WebMediaPlayerProxyImplAndroid::OnKeyAdded(int player_id,
261 const std::string& key_system, 269 const std::string& key_system,
262 const std::string& session_id) { 270 const std::string& session_id) {
263 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); 271 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
264 if (player) 272 if (player)
265 player->OnKeyAdded(key_system, session_id); 273 player->OnKeyAdded(key_system, session_id);
266 } 274 }
267 275
268 void WebMediaPlayerProxyImplAndroid::OnKeyError( 276 void WebMediaPlayerProxyImplAndroid::OnKeyError(
269 int player_id, 277 int player_id,
(...skipping 11 matching lines...) Expand all
281 const std::string& key_system, 289 const std::string& key_system,
282 const std::string& session_id, 290 const std::string& session_id,
283 const std::string& message, 291 const std::string& message,
284 const std::string& destination_url) { 292 const std::string& destination_url) {
285 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); 293 webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
286 if (player) 294 if (player)
287 player->OnKeyMessage(key_system, session_id, message, destination_url); 295 player->OnKeyMessage(key_system, session_id, message, destination_url);
288 } 296 }
289 297
290 } // namespace content 298 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698