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

Side by Side Diff: content/browser/android/media_player_manager_impl.cc

Issue 16098014: Handle config changes for MSE on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change unsigned to uint32 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/browser/android/media_player_manager_impl.h" 5 #include "content/browser/android/media_player_manager_impl.h"
6 6
7 #include "content/browser/android/media_resource_getter_impl.h" 7 #include "content/browser/android/media_resource_getter_impl.h"
8 #include "content/browser/web_contents/web_contents_view_android.h" 8 #include "content/browser/web_contents/web_contents_view_android.h"
9 #include "content/common/media/media_player_messages_android.h" 9 #include "content/common/media/media_player_messages_android.h"
10 #include "content/public/browser/browser_context.h" 10 #include "content/public/browser/browser_context.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 #endif 252 #endif
253 253
254 void MediaPlayerManagerImpl::OnReadFromDemuxerAck( 254 void MediaPlayerManagerImpl::OnReadFromDemuxerAck(
255 int player_id, 255 int player_id,
256 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { 256 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
257 MediaPlayerAndroid* player = GetPlayer(player_id); 257 MediaPlayerAndroid* player = GetPlayer(player_id);
258 if (player) 258 if (player)
259 player->ReadFromDemuxerAck(params); 259 player->ReadFromDemuxerAck(params);
260 } 260 }
261 261
262 void MediaPlayerManagerImpl::OnMediaSeekRequestAck(int player_id) { 262 void MediaPlayerManagerImpl::OnMediaSeekRequestAck(
263 int player_id, unsigned seek_request_id) {
263 MediaPlayerAndroid* player = GetPlayer(player_id); 264 MediaPlayerAndroid* player = GetPlayer(player_id);
264 if (player) 265 if (player)
265 player->OnSeekRequestAck(); 266 player->OnSeekRequestAck(seek_request_id);
266 } 267 }
267 268
268 MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) { 269 MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) {
269 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); 270 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
270 it != players_.end(); ++it) { 271 it != players_.end(); ++it) {
271 if ((*it)->player_id() == player_id) 272 if ((*it)->player_id() == player_id)
272 return *it; 273 return *it;
273 } 274 }
274 return NULL; 275 return NULL;
275 } 276 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 video_view_.OnBufferingUpdate(percentage); 308 video_view_.OnBufferingUpdate(percentage);
308 } 309 }
309 310
310 void MediaPlayerManagerImpl::OnSeekComplete(int player_id, 311 void MediaPlayerManagerImpl::OnSeekComplete(int player_id,
311 base::TimeDelta current_time) { 312 base::TimeDelta current_time) {
312 Send(new MediaPlayerMsg_MediaSeekCompleted( 313 Send(new MediaPlayerMsg_MediaSeekCompleted(
313 routing_id(), player_id, current_time)); 314 routing_id(), player_id, current_time));
314 } 315 }
315 316
316 void MediaPlayerManagerImpl::OnMediaSeekRequest( 317 void MediaPlayerManagerImpl::OnMediaSeekRequest(
317 int player_id, base::TimeDelta time_to_seek, bool request_surface) { 318 int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) {
318 bool request_texture_peer = request_surface;
319 if (request_surface && player_id == fullscreen_player_id_) {
320 video_view_.CreateContentVideoView();
321 request_texture_peer = false;
322 }
323 Send(new MediaPlayerMsg_MediaSeekRequest( 319 Send(new MediaPlayerMsg_MediaSeekRequest(
324 routing_id(), player_id, time_to_seek, request_texture_peer)); 320 routing_id(), player_id, time_to_seek, seek_request_id));
321 }
322
323 void MediaPlayerManagerImpl::OnMediaConfigRequest(int player_id) {
324 Send(new MediaPlayerMsg_MediaConfigRequest(routing_id(), player_id));
325 } 325 }
326 326
327 void MediaPlayerManagerImpl::OnError(int player_id, int error) { 327 void MediaPlayerManagerImpl::OnError(int player_id, int error) {
328 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error)); 328 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error));
329 if (fullscreen_player_id_ != -1) 329 if (fullscreen_player_id_ != -1)
330 video_view_.OnMediaPlayerError(error); 330 video_view_.OnMediaPlayerError(error);
331 } 331 }
332 332
333 void MediaPlayerManagerImpl::OnVideoSizeChanged( 333 void MediaPlayerManagerImpl::OnVideoSizeChanged(
334 int player_id, int width, int height) { 334 int player_id, int width, int height) {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); 443 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
444 it != players_.end(); ++it) { 444 it != players_.end(); ++it) {
445 if ((*it)->player_id() == player_id) { 445 if ((*it)->player_id() == player_id) {
446 players_.erase(it); 446 players_.erase(it);
447 break; 447 break;
448 } 448 }
449 } 449 }
450 } 450 }
451 451
452 } // namespace content 452 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698