Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/media/android/browser_media_player_manager.h" | 5 #include "content/browser/media/android/browser_media_player_manager.h" |
| 6 | 6 |
| 7 #include "base/android/scoped_java_ref.h" | 7 #include "base/android/scoped_java_ref.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "content/browser/android/content_view_core_impl.h" | 10 #include "content/browser/android/content_view_core_impl.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 135 } | 135 } |
| 136 | 136 |
| 137 BrowserMediaPlayerManager::~BrowserMediaPlayerManager() {} | 137 BrowserMediaPlayerManager::~BrowserMediaPlayerManager() {} |
| 138 | 138 |
| 139 bool BrowserMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) { | 139 bool BrowserMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) { |
| 140 bool handled = true; | 140 bool handled = true; |
| 141 IPC_BEGIN_MESSAGE_MAP(BrowserMediaPlayerManager, msg) | 141 IPC_BEGIN_MESSAGE_MAP(BrowserMediaPlayerManager, msg) |
| 142 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_EnterFullscreen, OnEnterFullscreen) | 142 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_EnterFullscreen, OnEnterFullscreen) |
| 143 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ExitFullscreen, OnExitFullscreen) | 143 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ExitFullscreen, OnExitFullscreen) |
| 144 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Initialize, OnInitialize) | 144 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Initialize, OnInitialize) |
| 145 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetFrameUrl, OnSetPlayerFrameUrl) | |
| 145 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Start, OnStart) | 146 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Start, OnStart) |
| 146 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Seek, OnSeek) | 147 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Seek, OnSeek) |
| 147 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Pause, OnPause) | 148 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Pause, OnPause) |
| 148 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetVolume, OnSetVolume) | 149 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetVolume, OnSetVolume) |
| 149 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetPoster, OnSetPoster) | 150 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetPoster, OnSetPoster) |
| 150 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Release, OnReleaseResources) | 151 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_Release, OnReleaseResources) |
| 151 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer) | 152 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer) |
| 152 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers, | 153 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers, |
| 153 DestroyAllMediaPlayers) | 154 DestroyAllMediaPlayers) |
| 154 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetCdm, OnSetCdm) | 155 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetCdm, OnSetCdm) |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 532 MediaPlayerAndroid* player = CreateMediaPlayer( | 533 MediaPlayerAndroid* player = CreateMediaPlayer( |
| 533 type, player_id, url, first_party_for_cookies, demuxer_client_id, | 534 type, player_id, url, first_party_for_cookies, demuxer_client_id, |
| 534 host->GetBrowserContext()->IsOffTheRecord(), this, | 535 host->GetBrowserContext()->IsOffTheRecord(), this, |
| 535 host->browser_demuxer_android()); | 536 host->browser_demuxer_android()); |
| 536 if (!player) | 537 if (!player) |
| 537 return; | 538 return; |
| 538 | 539 |
| 539 AddPlayer(player); | 540 AddPlayer(player); |
| 540 } | 541 } |
| 541 | 542 |
| 543 void BrowserMediaPlayerManager::OnSetPlayerFrameUrl(int player_id, | |
| 544 const GURL& frame_url) { | |
| 545 MediaPlayerAndroid* player = GetPlayer(player_id); | |
| 546 if (player) { | |
|
qinmin
2014/06/02 17:19:21
remove {} here
May
2014/06/04 14:05:08
Done.
| |
| 547 player->SetFrameUrl(frame_url); | |
| 548 } | |
| 549 } | |
| 550 | |
| 542 void BrowserMediaPlayerManager::OnStart(int player_id) { | 551 void BrowserMediaPlayerManager::OnStart(int player_id) { |
| 543 MediaPlayerAndroid* player = GetPlayer(player_id); | 552 MediaPlayerAndroid* player = GetPlayer(player_id); |
| 544 if (!player) | 553 if (!player) |
| 545 return; | 554 return; |
| 546 player->Start(); | 555 player->Start(); |
| 547 if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) { | 556 if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) { |
| 548 video_view_->OpenVideo(); | 557 video_view_->OpenVideo(); |
| 549 fullscreen_player_is_released_ = false; | 558 fullscreen_player_is_released_ = false; |
| 550 } | 559 } |
| 551 } | 560 } |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 892 #if defined(VIDEO_HOLE) | 901 #if defined(VIDEO_HOLE) |
| 893 MediaPlayerAndroid* player = GetPlayer(player_id); | 902 MediaPlayerAndroid* player = GetPlayer(player_id); |
| 894 if (player && player->IsSurfaceInUse()) | 903 if (player && player->IsSurfaceInUse()) |
| 895 return; | 904 return; |
| 896 if (external_video_surface_container_) | 905 if (external_video_surface_container_) |
| 897 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); | 906 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); |
| 898 #endif // defined(VIDEO_HOLE) | 907 #endif // defined(VIDEO_HOLE) |
| 899 } | 908 } |
| 900 | 909 |
| 901 } // namespace content | 910 } // namespace content |
| OLD | NEW |