| 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/content_view_core_impl.h" | 7 #include "content/browser/android/content_view_core_impl.h" |
| 8 #include "content/browser/android/media_resource_getter_impl.h" | 8 #include "content/browser/android/media_resource_getter_impl.h" |
| 9 #include "content/browser/web_contents/web_contents_view_android.h" | 9 #include "content/browser/web_contents/web_contents_view_android.h" |
| 10 #include "content/common/media/media_player_messages_android.h" | 10 #include "content/common/media/media_player_messages_android.h" |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 #endif | 267 #endif |
| 268 | 268 |
| 269 void MediaPlayerManagerImpl::OnReadFromDemuxerAck( | 269 void MediaPlayerManagerImpl::OnReadFromDemuxerAck( |
| 270 int player_id, | 270 int player_id, |
| 271 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { | 271 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) { |
| 272 MediaPlayerAndroid* player = GetPlayer(player_id); | 272 MediaPlayerAndroid* player = GetPlayer(player_id); |
| 273 if (player) | 273 if (player) |
| 274 player->ReadFromDemuxerAck(params); | 274 player->ReadFromDemuxerAck(params); |
| 275 } | 275 } |
| 276 | 276 |
| 277 void MediaPlayerManagerImpl::OnMediaSeekRequestAck(int player_id) { | 277 void MediaPlayerManagerImpl::OnMediaSeekRequestAck( |
| 278 int player_id, unsigned seek_request_id) { |
| 278 MediaPlayerAndroid* player = GetPlayer(player_id); | 279 MediaPlayerAndroid* player = GetPlayer(player_id); |
| 279 if (player) | 280 if (player) |
| 280 player->OnSeekRequestAck(); | 281 player->OnSeekRequestAck(seek_request_id); |
| 281 } | 282 } |
| 282 | 283 |
| 283 MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) { | 284 MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) { |
| 284 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); | 285 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); |
| 285 it != players_.end(); ++it) { | 286 it != players_.end(); ++it) { |
| 286 if ((*it)->player_id() == player_id) | 287 if ((*it)->player_id() == player_id) |
| 287 return *it; | 288 return *it; |
| 288 } | 289 } |
| 289 return NULL; | 290 return NULL; |
| 290 } | 291 } |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 video_view_->OnBufferingUpdate(percentage); | 323 video_view_->OnBufferingUpdate(percentage); |
| 323 } | 324 } |
| 324 | 325 |
| 325 void MediaPlayerManagerImpl::OnSeekComplete(int player_id, | 326 void MediaPlayerManagerImpl::OnSeekComplete(int player_id, |
| 326 base::TimeDelta current_time) { | 327 base::TimeDelta current_time) { |
| 327 Send(new MediaPlayerMsg_MediaSeekCompleted( | 328 Send(new MediaPlayerMsg_MediaSeekCompleted( |
| 328 routing_id(), player_id, current_time)); | 329 routing_id(), player_id, current_time)); |
| 329 } | 330 } |
| 330 | 331 |
| 331 void MediaPlayerManagerImpl::OnMediaSeekRequest( | 332 void MediaPlayerManagerImpl::OnMediaSeekRequest( |
| 332 int player_id, base::TimeDelta time_to_seek, bool request_surface) { | 333 int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) { |
| 333 bool request_texture_peer = request_surface; | |
| 334 if (request_surface && player_id == fullscreen_player_id_ && | |
| 335 video_view_.get()) { | |
| 336 video_view_->OpenVideo(); | |
| 337 request_texture_peer = false; | |
| 338 } | |
| 339 Send(new MediaPlayerMsg_MediaSeekRequest( | 334 Send(new MediaPlayerMsg_MediaSeekRequest( |
| 340 routing_id(), player_id, time_to_seek, request_texture_peer)); | 335 routing_id(), player_id, time_to_seek, seek_request_id)); |
| 336 } |
| 337 |
| 338 void MediaPlayerManagerImpl::OnMediaConfigRequest(int player_id) { |
| 339 Send(new MediaPlayerMsg_MediaConfigRequest(routing_id(), player_id)); |
| 341 } | 340 } |
| 342 | 341 |
| 343 void MediaPlayerManagerImpl::OnError(int player_id, int error) { | 342 void MediaPlayerManagerImpl::OnError(int player_id, int error) { |
| 344 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error)); | 343 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error)); |
| 345 if (fullscreen_player_id_ != -1) | 344 if (fullscreen_player_id_ != -1) |
| 346 video_view_->OnMediaPlayerError(error); | 345 video_view_->OnMediaPlayerError(error); |
| 347 } | 346 } |
| 348 | 347 |
| 349 void MediaPlayerManagerImpl::OnVideoSizeChanged( | 348 void MediaPlayerManagerImpl::OnVideoSizeChanged( |
| 350 int player_id, int width, int height) { | 349 int player_id, int width, int height) { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); | 458 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); |
| 460 it != players_.end(); ++it) { | 459 it != players_.end(); ++it) { |
| 461 if ((*it)->player_id() == player_id) { | 460 if ((*it)->player_id() == player_id) { |
| 462 players_.erase(it); | 461 players_.erase(it); |
| 463 break; | 462 break; |
| 464 } | 463 } |
| 465 } | 464 } |
| 466 } | 465 } |
| 467 | 466 |
| 468 } // namespace content | 467 } // namespace content |
| OLD | NEW |