Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 246 #endif | 246 #endif |
| 247 | 247 |
| 248 void MediaPlayerManagerImpl::OnReadFromDemuxerAck( | 248 void MediaPlayerManagerImpl::OnReadFromDemuxerAck( |
| 249 int player_id, | 249 int player_id, |
| 250 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { | 250 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { |
| 251 MediaPlayerAndroid* player = GetPlayer(player_id); | 251 MediaPlayerAndroid* player = GetPlayer(player_id); |
| 252 if (player) | 252 if (player) |
| 253 player->ReadFromDemuxerAck(params); | 253 player->ReadFromDemuxerAck(params); |
| 254 } | 254 } |
| 255 | 255 |
| 256 void MediaPlayerManagerImpl::OnMediaSeekRequestAck(int player_id) { | 256 void MediaPlayerManagerImpl::OnMediaSeekRequestAck( |
| 257 int player_id, unsigned request_id) { | |
|
acolwell GONE FROM CHROMIUM
2013/06/04 15:19:14
nit: ditto
qinmin
2013/06/04 19:03:23
Done.
| |
| 257 MediaPlayerAndroid* player = GetPlayer(player_id); | 258 MediaPlayerAndroid* player = GetPlayer(player_id); |
| 258 if (player) | 259 if (player) |
| 259 player->OnSeekRequestAck(); | 260 player->OnSeekRequestAck(request_id); |
| 260 } | 261 } |
| 261 | 262 |
| 262 MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) { | 263 MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) { |
| 263 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); | 264 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); |
| 264 it != players_.end(); ++it) { | 265 it != players_.end(); ++it) { |
| 265 if ((*it)->player_id() == player_id) | 266 if ((*it)->player_id() == player_id) |
| 266 return *it; | 267 return *it; |
| 267 } | 268 } |
| 268 return NULL; | 269 return NULL; |
| 269 } | 270 } |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 301 video_view_.OnBufferingUpdate(percentage); | 302 video_view_.OnBufferingUpdate(percentage); |
| 302 } | 303 } |
| 303 | 304 |
| 304 void MediaPlayerManagerImpl::OnSeekComplete(int player_id, | 305 void MediaPlayerManagerImpl::OnSeekComplete(int player_id, |
| 305 base::TimeDelta current_time) { | 306 base::TimeDelta current_time) { |
| 306 Send(new MediaPlayerMsg_MediaSeekCompleted( | 307 Send(new MediaPlayerMsg_MediaSeekCompleted( |
| 307 routing_id(), player_id, current_time)); | 308 routing_id(), player_id, current_time)); |
| 308 } | 309 } |
| 309 | 310 |
| 310 void MediaPlayerManagerImpl::OnMediaSeekRequest( | 311 void MediaPlayerManagerImpl::OnMediaSeekRequest( |
| 311 int player_id, base::TimeDelta time_to_seek, bool request_surface) { | 312 int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) { |
| 312 bool request_texture_peer = request_surface; | |
| 313 if (request_surface && player_id == fullscreen_player_id_) { | |
| 314 video_view_.CreateContentVideoView(); | |
| 315 request_texture_peer = false; | |
| 316 } | |
| 317 Send(new MediaPlayerMsg_MediaSeekRequest( | 313 Send(new MediaPlayerMsg_MediaSeekRequest( |
| 318 routing_id(), player_id, time_to_seek, request_texture_peer)); | 314 routing_id(), player_id, time_to_seek, seek_request_id)); |
| 315 } | |
| 316 | |
| 317 void MediaPlayerManagerImpl::OnMediaConfigRequest(int player_id) { | |
| 318 Send(new MediaPlayerMsg_MediaConfigRequest(routing_id(), player_id)); | |
| 319 } | 319 } |
| 320 | 320 |
| 321 void MediaPlayerManagerImpl::OnError(int player_id, int error) { | 321 void MediaPlayerManagerImpl::OnError(int player_id, int error) { |
| 322 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error)); | 322 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error)); |
| 323 if (fullscreen_player_id_ != -1) | 323 if (fullscreen_player_id_ != -1) |
| 324 video_view_.OnMediaPlayerError(error); | 324 video_view_.OnMediaPlayerError(error); |
| 325 } | 325 } |
| 326 | 326 |
| 327 void MediaPlayerManagerImpl::OnVideoSizeChanged( | 327 void MediaPlayerManagerImpl::OnVideoSizeChanged( |
| 328 int player_id, int width, int height) { | 328 int player_id, int width, int height) { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 390 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); | 390 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); |
| 391 it != players_.end(); ++it) { | 391 it != players_.end(); ++it) { |
| 392 if ((*it)->player_id() == player_id) { | 392 if ((*it)->player_id() == player_id) { |
| 393 players_.erase(it); | 393 players_.erase(it); |
| 394 break; | 394 break; |
| 395 } | 395 } |
| 396 } | 396 } |
| 397 } | 397 } |
| 398 | 398 |
| 399 } // namespace content | 399 } // namespace content |
| OLD | NEW |