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 "content/browser/android/content_view_core_impl.h" | 9 #include "content/browser/android/content_view_core_impl.h" |
10 #include "content/browser/media/android/browser_demuxer_android.h" | 10 #include "content/browser/media/android/browser_demuxer_android.h" |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 // at this point, player->GetCurrentTime() will be wrong until | 164 // at this point, player->GetCurrentTime() will be wrong until |
165 // FullscreenPlayerPlay (http://crbug.com/322798). | 165 // FullscreenPlayerPlay (http://crbug.com/322798). |
166 OnSeekRequest(fullscreen_player_id_, | 166 OnSeekRequest(fullscreen_player_id_, |
167 base::TimeDelta::FromMilliseconds(msec)); | 167 base::TimeDelta::FromMilliseconds(msec)); |
168 } | 168 } |
169 } | 169 } |
170 | 170 |
171 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { | 171 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { |
172 if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) | 172 if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) |
173 delegate->ToggleFullscreenModeForTab(web_contents_, false); | 173 delegate->ToggleFullscreenModeForTab(web_contents_, false); |
174 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 174 if (RenderWidgetHostViewAndroid* view_android = |
175 switches::kDisableOverlayFullscreenVideoSubtitle)) { | 175 static_cast<RenderWidgetHostViewAndroid*>( |
176 if (RenderWidgetHostViewAndroid* view_android = | 176 web_contents_->GetRenderWidgetHostView())) { |
177 static_cast<RenderWidgetHostViewAndroid*>( | 177 view_android->SetOverlayVideoMode(false); |
178 web_contents_->GetRenderWidgetHostView())) { | |
179 view_android->SetOverlayVideoMode(false); | |
180 } | |
181 } | 178 } |
182 | 179 |
183 Send( | 180 Send( |
184 new MediaPlayerMsg_DidExitFullscreen(RoutingID(), fullscreen_player_id_)); | 181 new MediaPlayerMsg_DidExitFullscreen(RoutingID(), fullscreen_player_id_)); |
185 video_view_.reset(); | 182 video_view_.reset(); |
186 MediaPlayerAndroid* player = GetFullscreenPlayer(); | 183 MediaPlayerAndroid* player = GetFullscreenPlayer(); |
187 fullscreen_player_id_ = -1; | 184 fullscreen_player_id_ = -1; |
188 if (!player) | 185 if (!player) |
189 return; | 186 return; |
190 if (release_media_player) | 187 if (release_media_player) |
(...skipping 15 matching lines...) Expand all Loading... |
206 MediaPlayerAndroid* player = GetFullscreenPlayer(); | 203 MediaPlayerAndroid* player = GetFullscreenPlayer(); |
207 if (!player) | 204 if (!player) |
208 return; | 205 return; |
209 | 206 |
210 bool empty_surface = surface.IsEmpty(); | 207 bool empty_surface = surface.IsEmpty(); |
211 player->SetVideoSurface(surface.Pass()); | 208 player->SetVideoSurface(surface.Pass()); |
212 if (empty_surface) | 209 if (empty_surface) |
213 return; | 210 return; |
214 | 211 |
215 Send(new MediaPlayerMsg_DidEnterFullscreen(RoutingID(), player->player_id())); | 212 Send(new MediaPlayerMsg_DidEnterFullscreen(RoutingID(), player->player_id())); |
216 if (CommandLine::ForCurrentProcess()->HasSwitch( | |
217 switches::kDisableOverlayFullscreenVideoSubtitle)) { | |
218 return; | |
219 } | |
220 if (RenderWidgetHostViewAndroid* view_android = | 213 if (RenderWidgetHostViewAndroid* view_android = |
221 static_cast<RenderWidgetHostViewAndroid*>( | 214 static_cast<RenderWidgetHostViewAndroid*>( |
222 web_contents_->GetRenderWidgetHostView())) { | 215 web_contents_->GetRenderWidgetHostView())) { |
223 view_android->SetOverlayVideoMode(true); | 216 view_android->SetOverlayVideoMode(true); |
224 } | 217 } |
225 } | 218 } |
226 | 219 |
227 void BrowserMediaPlayerManager::OnMediaMetadataChanged( | 220 void BrowserMediaPlayerManager::OnMediaMetadataChanged( |
228 int player_id, base::TimeDelta duration, int width, int height, | 221 int player_id, base::TimeDelta duration, int width, int height, |
229 bool success) { | 222 bool success) { |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); | 601 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); |
609 #endif // defined(VIDEO_HOLE) | 602 #endif // defined(VIDEO_HOLE) |
610 } | 603 } |
611 | 604 |
612 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { | 605 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { |
613 player->Release(); | 606 player->Release(); |
614 ReleaseMediaResources(player->player_id()); | 607 ReleaseMediaResources(player->player_id()); |
615 } | 608 } |
616 | 609 |
617 } // namespace content | 610 } // namespace content |
OLD | NEW |