| 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_android.h" | 5 #include "content/browser/android/media_player_manager_android.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" |
| 8 #include "content/browser/android/cookie_getter_impl.h" | 9 #include "content/browser/android/cookie_getter_impl.h" |
| 9 #include "content/common/media/media_player_messages.h" | 10 #include "content/common/media/media_player_messages.h" |
| 10 #include "content/public/browser/browser_context.h" | 11 #include "content/public/browser/browser_context.h" |
| 11 #include "content/public/browser/render_process_host.h" | 12 #include "content/public/browser/render_process_host.h" |
| 12 #include "content/public/browser/render_view_host.h" | 13 #include "content/public/browser/render_view_host.h" |
| 14 #include "content/public/common/content_switches.h" |
| 13 | 15 |
| 14 using media::MediaPlayerBridge; | 16 using media::MediaPlayerBridge; |
| 15 | 17 |
| 16 // Threshold on the number of media players per renderer before we start | 18 // Threshold on the number of media players per renderer before we start |
| 17 // attempting to release inactive media players. | 19 // attempting to release inactive media players. |
| 18 static const int kMediaPlayerThreshold = 1; | 20 static const int kMediaPlayerThreshold = 1; |
| 19 | 21 |
| 20 namespace content { | 22 namespace content { |
| 21 | 23 |
| 22 MediaPlayerManagerAndroid::MediaPlayerManagerAndroid( | 24 MediaPlayerManagerAndroid::MediaPlayerManagerAndroid( |
| 23 RenderViewHost* render_view_host) | 25 RenderViewHost* render_view_host) |
| 24 : RenderViewHostObserver(render_view_host), | 26 : RenderViewHostObserver(render_view_host), |
| 25 ALLOW_THIS_IN_INITIALIZER_LIST(video_view_(this)), | 27 ALLOW_THIS_IN_INITIALIZER_LIST(video_view_(this)), |
| 26 fullscreen_player_id_(-1) { | 28 video_view_player_id_(-1) { |
| 27 } | 29 } |
| 28 | 30 |
| 29 MediaPlayerManagerAndroid::~MediaPlayerManagerAndroid() {} | 31 MediaPlayerManagerAndroid::~MediaPlayerManagerAndroid() {} |
| 30 | 32 |
| 31 bool MediaPlayerManagerAndroid::OnMessageReceived(const IPC::Message& msg) { | 33 bool MediaPlayerManagerAndroid::OnMessageReceived(const IPC::Message& msg) { |
| 32 bool handled = true; | 34 bool handled = true; |
| 33 IPC_BEGIN_MESSAGE_MAP(MediaPlayerManagerAndroid, msg) | 35 IPC_BEGIN_MESSAGE_MAP(MediaPlayerManagerAndroid, msg) |
| 34 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_EnterFullscreen, OnEnterFullscreen) | 36 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_EnterFullscreen, OnEnterFullscreen) |
| 35 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ExitFullscreen, OnExitFullscreen) | 37 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ExitFullscreen, OnExitFullscreen) |
| 36 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerInitialize, OnInitialize) | 38 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerInitialize, OnInitialize) |
| 37 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerStart, OnStart) | 39 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerStart, OnStart) |
| 38 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerSeek, OnSeek) | 40 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerSeek, OnSeek) |
| 39 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerPause, OnPause) | 41 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerPause, OnPause) |
| 40 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerRelease, | 42 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaPlayerRelease, |
| 41 OnReleaseResources) | 43 OnReleaseResources) |
| 42 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer) | 44 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer) |
| 43 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers, | 45 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers, |
| 44 DestroyAllMediaPlayers) | 46 DestroyAllMediaPlayers) |
| 45 IPC_MESSAGE_UNHANDLED(handled = false) | 47 IPC_MESSAGE_UNHANDLED(handled = false) |
| 46 IPC_END_MESSAGE_MAP() | 48 IPC_END_MESSAGE_MAP() |
| 47 return handled; | 49 return handled; |
| 48 } | 50 } |
| 49 | 51 |
| 50 void MediaPlayerManagerAndroid::FullscreenPlayerPlay() { | 52 void MediaPlayerManagerAndroid::FullscreenPlayerPlay() { |
| 51 MediaPlayerBridge* player = GetFullscreenPlayer(); | 53 MediaPlayerBridge* player = GetFullscreenPlayer(); |
| 52 if (player) { | 54 if (player) { |
| 53 player->Start(); | 55 player->Start(); |
| 54 Send(new MediaPlayerMsg_DidMediaPlayerPlay( | 56 Send(new MediaPlayerMsg_DidMediaPlayerPlay( |
| 55 routing_id(), fullscreen_player_id_)); | 57 routing_id(), video_view_player_id_)); |
| 56 } | 58 } |
| 57 } | 59 } |
| 58 | 60 |
| 59 void MediaPlayerManagerAndroid::FullscreenPlayerPause() { | 61 void MediaPlayerManagerAndroid::FullscreenPlayerPause() { |
| 60 MediaPlayerBridge* player = GetFullscreenPlayer(); | 62 MediaPlayerBridge* player = GetFullscreenPlayer(); |
| 61 if (player) { | 63 if (player) { |
| 62 player->Pause(); | 64 player->Pause(); |
| 63 Send(new MediaPlayerMsg_DidMediaPlayerPause( | 65 Send(new MediaPlayerMsg_DidMediaPlayerPause( |
| 64 routing_id(), fullscreen_player_id_)); | 66 routing_id(), video_view_player_id_)); |
| 65 } | 67 } |
| 66 } | 68 } |
| 67 | 69 |
| 68 void MediaPlayerManagerAndroid::FullscreenPlayerSeek(int msec) { | 70 void MediaPlayerManagerAndroid::FullscreenPlayerSeek(int msec) { |
| 69 MediaPlayerBridge* player = GetFullscreenPlayer(); | 71 MediaPlayerBridge* player = GetFullscreenPlayer(); |
| 70 if (player) | 72 if (player) |
| 71 player->SeekTo(base::TimeDelta::FromMilliseconds(msec)); | 73 player->SeekTo(base::TimeDelta::FromMilliseconds(msec)); |
| 72 } | 74 } |
| 73 | 75 |
| 74 void MediaPlayerManagerAndroid::ExitFullscreen(bool release_media_player) { | 76 void MediaPlayerManagerAndroid::ExitFullscreen(bool release_media_player) { |
| 75 Send(new MediaPlayerMsg_DidExitFullscreen( | 77 Send(new MediaPlayerMsg_DidExitVideoView( |
| 76 routing_id(), fullscreen_player_id_)); | 78 routing_id(), video_view_player_id_, |
| 79 ContentVideoView::PERSONALITY_FULL_SCREEN)); |
| 77 MediaPlayerBridge* player = GetFullscreenPlayer(); | 80 MediaPlayerBridge* player = GetFullscreenPlayer(); |
| 78 fullscreen_player_id_ = -1; | 81 video_view_player_id_ = -1; |
| 79 if (!player) | 82 if (!player) |
| 80 return; | 83 return; |
| 81 if (release_media_player) | 84 if (release_media_player) |
| 82 player->Release(); | 85 player->Release(); |
| 83 else | 86 else |
| 84 player->SetVideoSurface(NULL); | 87 player->SetVideoSurface(NULL); |
| 85 } | 88 } |
| 86 | 89 |
| 87 void MediaPlayerManagerAndroid::SetVideoSurface(jobject surface) { | 90 void MediaPlayerManagerAndroid::SetVideoSurface(jobject surface) { |
| 88 MediaPlayerBridge* player = GetFullscreenPlayer(); | 91 MediaPlayerBridge* player = GetPlayer(video_view_player_id_); |
| 89 if (player) { | 92 if (player) { |
| 90 player->SetVideoSurface(surface); | 93 player->SetVideoSurface(surface); |
| 91 Send(new MediaPlayerMsg_DidEnterFullscreen( | 94 Send(new MediaPlayerMsg_DidEnterVideoView( |
| 92 routing_id(), player->player_id())); | 95 routing_id(), player->player_id(), video_view_.getPersonality())); |
| 93 } | 96 } |
| 94 } | 97 } |
| 95 | 98 |
| 96 void MediaPlayerManagerAndroid::OnInitialize( | 99 void MediaPlayerManagerAndroid::OnInitialize( |
| 97 int player_id, const std::string& url, | 100 int player_id, const std::string& url, |
| 98 const std::string& first_party_for_cookies) { | 101 const std::string& first_party_for_cookies) { |
| 99 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); | 102 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); |
| 100 it != players_.end(); ++it) { | 103 it != players_.end(); ++it) { |
| 101 if ((*it)->player_id() == player_id) { | 104 if ((*it)->player_id() == player_id) { |
| 102 players_.erase(it); | 105 players_.erase(it); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 126 base::Bind(&MediaPlayerManagerAndroid::OnMediaInterrupted, | 129 base::Bind(&MediaPlayerManagerAndroid::OnMediaInterrupted, |
| 127 base::Unretained(this)))); | 130 base::Unretained(this)))); |
| 128 | 131 |
| 129 // Send a MediaPrepared message to webkit so that Load() can finish. | 132 // Send a MediaPrepared message to webkit so that Load() can finish. |
| 130 Send(new MediaPlayerMsg_MediaPrepared( | 133 Send(new MediaPlayerMsg_MediaPrepared( |
| 131 routing_id(), player_id, GetPlayer(player_id)->GetDuration())); | 134 routing_id(), player_id, GetPlayer(player_id)->GetDuration())); |
| 132 } | 135 } |
| 133 | 136 |
| 134 void MediaPlayerManagerAndroid::OnStart(int player_id) { | 137 void MediaPlayerManagerAndroid::OnStart(int player_id) { |
| 135 MediaPlayerBridge* player = GetPlayer(player_id); | 138 MediaPlayerBridge* player = GetPlayer(player_id); |
| 136 if (player) | 139 if (player) { |
| 140 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 141 switches::kRenderVideoOnExternalSurface)) { |
| 142 // TODO(wonsik): Find a way to enable this feature only when it is |
| 143 // absolutely necessary (e.g. protected content). |
| 144 if (video_view_player_id_ != -1) |
| 145 ExitFromVideoView(video_view_player_id_, true /* pause */); |
| 146 video_view_player_id_ = player_id; |
| 147 video_view_.CreateContentVideoView( |
| 148 ContentVideoView::PERSONALITY_EMBEDDED); |
| 149 } |
| 137 player->Start(); | 150 player->Start(); |
| 151 } |
| 138 } | 152 } |
| 139 | 153 |
| 140 void MediaPlayerManagerAndroid::OnSeek(int player_id, base::TimeDelta time) { | 154 void MediaPlayerManagerAndroid::OnSeek(int player_id, base::TimeDelta time) { |
| 141 MediaPlayerBridge* player = GetPlayer(player_id); | 155 MediaPlayerBridge* player = GetPlayer(player_id); |
| 142 if (player) | 156 if (player) |
| 143 player->SeekTo(time); | 157 player->SeekTo(time); |
| 144 } | 158 } |
| 145 | 159 |
| 146 void MediaPlayerManagerAndroid::OnPause(int player_id) { | 160 void MediaPlayerManagerAndroid::OnPause(int player_id) { |
| 147 MediaPlayerBridge* player = GetPlayer(player_id); | 161 MediaPlayerBridge* player = GetPlayer(player_id); |
| 148 if (player) | 162 if (player) |
| 149 player->Pause(); | 163 player->Pause(); |
| 150 } | 164 } |
| 151 | 165 |
| 152 void MediaPlayerManagerAndroid::OnEnterFullscreen(int player_id) { | 166 void MediaPlayerManagerAndroid::OnEnterFullscreen(int player_id) { |
| 153 DCHECK_EQ(fullscreen_player_id_, -1); | 167 if (video_view_player_id_ != -1) |
| 168 ExitFromVideoView( |
| 169 video_view_player_id_, |
| 170 (video_view_player_id_ != player_id) /* pause */); |
| 154 | 171 |
| 155 fullscreen_player_id_ = player_id; | 172 video_view_player_id_ = player_id; |
| 156 video_view_.CreateContentVideoView(); | 173 video_view_.CreateContentVideoView(ContentVideoView::PERSONALITY_FULL_SCREEN); |
| 157 } | 174 } |
| 158 | 175 |
| 159 void MediaPlayerManagerAndroid::OnExitFullscreen(int player_id) { | 176 void MediaPlayerManagerAndroid::OnExitFullscreen(int player_id) { |
| 160 if (fullscreen_player_id_ == player_id) { | 177 ExitFromVideoView(player_id, false /* pause */); |
| 161 MediaPlayerBridge* player = GetPlayer(player_id); | 178 } |
| 162 if (player) | 179 |
| 163 player->SetVideoSurface(NULL); | 180 void MediaPlayerManagerAndroid::ExitFromVideoView(int player_id, bool pause) { |
| 164 video_view_.DestroyContentVideoView(); | 181 if (video_view_player_id_ != player_id) |
| 165 fullscreen_player_id_ = -1; | 182 return; |
| 183 |
| 184 if (video_view_.getPersonality() == ContentVideoView::PERSONALITY_EMBEDDED) { |
| 185 Send(new MediaPlayerMsg_DidExitVideoView( |
| 186 routing_id(), video_view_player_id_, |
| 187 ContentVideoView::PERSONALITY_EMBEDDED)); |
| 166 } | 188 } |
| 189 MediaPlayerBridge* player = GetPlayer(player_id); |
| 190 if (player) { |
| 191 player->SetVideoSurface(NULL); |
| 192 if (pause) |
| 193 player->Pause(); |
| 194 } |
| 195 video_view_.DestroyContentVideoView(); |
| 196 video_view_player_id_ = -1; |
| 167 } | 197 } |
| 168 | 198 |
| 169 void MediaPlayerManagerAndroid::OnReleaseResources(int player_id) { | 199 void MediaPlayerManagerAndroid::OnReleaseResources(int player_id) { |
| 170 MediaPlayerBridge* player = GetPlayer(player_id); | 200 MediaPlayerBridge* player = GetPlayer(player_id); |
| 171 // Don't release the fullscreen player when tab visibility changes, | 201 // Don't release the fullscreen player when tab visibility changes, |
| 172 // it will be released when user hit the back/home button or when | 202 // it will be released when user hit the back/home button or when |
| 173 // OnDestroyPlayer is called. | 203 // OnDestroyPlayer is called. |
| 174 if (player && player_id != fullscreen_player_id_) | 204 if (player && player_id != video_view_player_id_) |
| 175 player->Release(); | 205 player->Release(); |
| 176 } | 206 } |
| 177 | 207 |
| 178 void MediaPlayerManagerAndroid::OnDestroyPlayer(int player_id) { | 208 void MediaPlayerManagerAndroid::OnDestroyPlayer(int player_id) { |
| 179 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); | 209 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); |
| 180 it != players_.end(); ++it) { | 210 it != players_.end(); ++it) { |
| 181 if ((*it)->player_id() == player_id) { | 211 if ((*it)->player_id() == player_id) { |
| 182 players_.erase(it); | 212 players_.erase(it); |
| 183 break; | 213 break; |
| 184 } | 214 } |
| 185 } | 215 } |
| 186 if (fullscreen_player_id_ == player_id) | 216 if (video_view_player_id_ == player_id) |
| 187 fullscreen_player_id_ = -1; | 217 video_view_player_id_ = -1; |
| 188 } | 218 } |
| 189 | 219 |
| 190 void MediaPlayerManagerAndroid::DestroyAllMediaPlayers() { | 220 void MediaPlayerManagerAndroid::DestroyAllMediaPlayers() { |
| 191 players_.clear(); | 221 players_.clear(); |
| 192 if (fullscreen_player_id_ != -1) { | 222 if (video_view_player_id_ != -1) { |
| 193 video_view_.DestroyContentVideoView(); | 223 video_view_.DestroyContentVideoView(); |
| 194 fullscreen_player_id_ = -1; | 224 video_view_player_id_ = -1; |
| 195 } | 225 } |
| 196 } | 226 } |
| 197 | 227 |
| 198 MediaPlayerBridge* MediaPlayerManagerAndroid::GetPlayer(int player_id) { | 228 MediaPlayerBridge* MediaPlayerManagerAndroid::GetPlayer(int player_id) { |
| 199 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); | 229 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); |
| 200 it != players_.end(); ++it) { | 230 it != players_.end(); ++it) { |
| 201 if ((*it)->player_id() == player_id) | 231 if ((*it)->player_id() == player_id) |
| 202 return *it; | 232 return *it; |
| 203 } | 233 } |
| 204 return NULL; | 234 return NULL; |
| 205 } | 235 } |
| 206 | 236 |
| 207 MediaPlayerBridge* MediaPlayerManagerAndroid::GetFullscreenPlayer() { | 237 MediaPlayerBridge* MediaPlayerManagerAndroid::GetFullscreenPlayer() { |
| 208 return GetPlayer(fullscreen_player_id_); | 238 if (video_view_.getPersonality() != |
| 239 ContentVideoView::PERSONALITY_FULL_SCREEN) { |
| 240 return NULL; |
| 241 } |
| 242 return GetPlayer(video_view_player_id_); |
| 209 } | 243 } |
| 210 | 244 |
| 211 void MediaPlayerManagerAndroid::OnPrepared(int player_id, | 245 void MediaPlayerManagerAndroid::OnPrepared(int player_id, |
| 212 base::TimeDelta duration) { | 246 base::TimeDelta duration) { |
| 213 Send(new MediaPlayerMsg_MediaPrepared(routing_id(), player_id, duration)); | 247 Send(new MediaPlayerMsg_MediaPrepared(routing_id(), player_id, duration)); |
| 214 if (fullscreen_player_id_ != -1) | 248 if (video_view_player_id_ != -1) |
| 215 video_view_.UpdateMediaMetadata(); | 249 video_view_.UpdateMediaMetadata(); |
| 216 } | 250 } |
| 217 | 251 |
| 218 void MediaPlayerManagerAndroid::OnPlaybackComplete(int player_id) { | 252 void MediaPlayerManagerAndroid::OnPlaybackComplete(int player_id) { |
| 219 Send(new MediaPlayerMsg_MediaPlaybackCompleted(routing_id(), player_id)); | 253 Send(new MediaPlayerMsg_MediaPlaybackCompleted(routing_id(), player_id)); |
| 220 if (fullscreen_player_id_ != -1) | 254 if (video_view_player_id_ != -1) |
| 221 video_view_.OnPlaybackComplete(); | 255 video_view_.OnPlaybackComplete(); |
| 222 } | 256 } |
| 223 | 257 |
| 224 void MediaPlayerManagerAndroid::OnMediaInterrupted(int player_id) { | 258 void MediaPlayerManagerAndroid::OnMediaInterrupted(int player_id) { |
| 225 // Tell WebKit that the audio should be paused, then release all resources | 259 // Tell WebKit that the audio should be paused, then release all resources |
| 226 Send(new MediaPlayerMsg_DidMediaPlayerPause(routing_id(), player_id)); | 260 Send(new MediaPlayerMsg_DidMediaPlayerPause(routing_id(), player_id)); |
| 227 OnReleaseResources(player_id); | 261 OnReleaseResources(player_id); |
| 228 } | 262 } |
| 229 | 263 |
| 230 void MediaPlayerManagerAndroid::OnBufferingUpdate( | 264 void MediaPlayerManagerAndroid::OnBufferingUpdate( |
| 231 int player_id, int percentage) { | 265 int player_id, int percentage) { |
| 232 Send(new MediaPlayerMsg_MediaBufferingUpdate( | 266 Send(new MediaPlayerMsg_MediaBufferingUpdate( |
| 233 routing_id(), player_id, percentage)); | 267 routing_id(), player_id, percentage)); |
| 234 if (fullscreen_player_id_ != -1) | 268 if (video_view_player_id_ != -1) |
| 235 video_view_.OnBufferingUpdate(percentage); | 269 video_view_.OnBufferingUpdate(percentage); |
| 236 } | 270 } |
| 237 | 271 |
| 238 void MediaPlayerManagerAndroid::OnSeekComplete(int player_id, | 272 void MediaPlayerManagerAndroid::OnSeekComplete(int player_id, |
| 239 base::TimeDelta current_time) { | 273 base::TimeDelta current_time) { |
| 240 Send(new MediaPlayerMsg_MediaSeekCompleted( | 274 Send(new MediaPlayerMsg_MediaSeekCompleted( |
| 241 routing_id(), player_id, current_time)); | 275 routing_id(), player_id, current_time)); |
| 242 } | 276 } |
| 243 | 277 |
| 244 void MediaPlayerManagerAndroid::OnError(int player_id, int error) { | 278 void MediaPlayerManagerAndroid::OnError(int player_id, int error) { |
| 245 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error)); | 279 Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error)); |
| 246 if (fullscreen_player_id_ != -1) | 280 if (video_view_player_id_ != -1) |
| 247 video_view_.OnMediaPlayerError(error); | 281 video_view_.OnMediaPlayerError(error); |
| 248 } | 282 } |
| 249 | 283 |
| 250 void MediaPlayerManagerAndroid::OnVideoSizeChanged( | 284 void MediaPlayerManagerAndroid::OnVideoSizeChanged( |
| 251 int player_id, int width, int height) { | 285 int player_id, int width, int height) { |
| 252 Send(new MediaPlayerMsg_MediaVideoSizeChanged(routing_id(), player_id, | 286 Send(new MediaPlayerMsg_MediaVideoSizeChanged(routing_id(), player_id, |
| 253 width, height)); | 287 width, height)); |
| 254 if (fullscreen_player_id_ != -1) | 288 if (video_view_player_id_ != -1) |
| 255 video_view_.OnVideoSizeChanged(width, height); | 289 video_view_.OnVideoSizeChanged(width, height); |
| 256 } | 290 } |
| 257 | 291 |
| 258 void MediaPlayerManagerAndroid::OnTimeUpdate(int player_id, | 292 void MediaPlayerManagerAndroid::OnTimeUpdate(int player_id, |
| 259 base::TimeDelta current_time) { | 293 base::TimeDelta current_time) { |
| 260 Send(new MediaPlayerMsg_MediaTimeUpdate( | 294 Send(new MediaPlayerMsg_MediaTimeUpdate( |
| 261 routing_id(), player_id, current_time)); | 295 routing_id(), player_id, current_time)); |
| 262 } | 296 } |
| 263 | 297 |
| 264 void MediaPlayerManagerAndroid::RequestMediaResources( | 298 void MediaPlayerManagerAndroid::RequestMediaResources( |
| (...skipping 13 matching lines...) Expand all Loading... |
| 278 else | 312 else |
| 279 num_active_player++; | 313 num_active_player++; |
| 280 } | 314 } |
| 281 | 315 |
| 282 // Number of active players are less than the threshold, do nothing. | 316 // Number of active players are less than the threshold, do nothing. |
| 283 if (num_active_player < kMediaPlayerThreshold) | 317 if (num_active_player < kMediaPlayerThreshold) |
| 284 return; | 318 return; |
| 285 | 319 |
| 286 for (it = players_.begin(); it != players_.end(); ++it) { | 320 for (it = players_.begin(); it != players_.end(); ++it) { |
| 287 if ((*it)->prepared() && !(*it)->IsPlaying() && | 321 if ((*it)->prepared() && !(*it)->IsPlaying() && |
| 288 fullscreen_player_id_ != (*it)->player_id()) { | 322 video_view_player_id_ != (*it)->player_id()) { |
| 289 (*it)->Release(); | 323 (*it)->Release(); |
| 290 Send(new MediaPlayerMsg_MediaPlayerReleased( | 324 Send(new MediaPlayerMsg_MediaPlayerReleased( |
| 291 routing_id(), (*it)->player_id())); | 325 routing_id(), (*it)->player_id())); |
| 292 } | 326 } |
| 293 } | 327 } |
| 294 } | 328 } |
| 295 | 329 |
| 296 void MediaPlayerManagerAndroid::ReleaseMediaResources( | 330 void MediaPlayerManagerAndroid::ReleaseMediaResources( |
| 297 MediaPlayerBridge* player) { | 331 MediaPlayerBridge* player) { |
| 298 // Nothing needs to be done. | 332 // Nothing needs to be done. |
| 299 } | 333 } |
| 300 | 334 |
| 301 } // namespace content | 335 } // namespace content |
| OLD | NEW |