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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 if (player) { | 153 if (player) { |
154 // TODO(kbalazs): if |fullscreen_player_is_released_| is true | 154 // TODO(kbalazs): if |fullscreen_player_is_released_| is true |
155 // at this point, player->GetCurrentTime() will be wrong until | 155 // at this point, player->GetCurrentTime() will be wrong until |
156 // FullscreenPlayerPlay (http://crbug.com/322798). | 156 // FullscreenPlayerPlay (http://crbug.com/322798). |
157 OnSeekRequest(fullscreen_player_id_, | 157 OnSeekRequest(fullscreen_player_id_, |
158 base::TimeDelta::FromMilliseconds(msec)); | 158 base::TimeDelta::FromMilliseconds(msec)); |
159 } | 159 } |
160 } | 160 } |
161 | 161 |
162 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { | 162 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { |
| 163 if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) |
| 164 delegate->ToggleFullscreenModeForTab(web_contents_, false); |
163 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 165 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
164 switches::kDisableOverlayFullscreenVideoSubtitle)) { | 166 switches::kDisableOverlayFullscreenVideoSubtitle)) { |
165 if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) | |
166 delegate->ToggleFullscreenModeForTab(web_contents_, false); | |
167 if (RenderWidgetHostViewAndroid* view_android = | 167 if (RenderWidgetHostViewAndroid* view_android = |
168 static_cast<RenderWidgetHostViewAndroid*>( | 168 static_cast<RenderWidgetHostViewAndroid*>( |
169 web_contents_->GetRenderWidgetHostView())) { | 169 web_contents_->GetRenderWidgetHostView())) { |
170 view_android->SetOverlayVideoMode(false); | 170 view_android->SetOverlayVideoMode(false); |
171 } | 171 } |
172 } | 172 } |
173 | 173 |
174 Send( | 174 Send( |
175 new MediaPlayerMsg_DidExitFullscreen(RoutingID(), fullscreen_player_id_)); | 175 new MediaPlayerMsg_DidExitFullscreen(RoutingID(), fullscreen_player_id_)); |
176 video_view_.reset(); | 176 video_view_.reset(); |
(...skipping 27 matching lines...) Expand all Loading... |
204 Send(new MediaPlayerMsg_DidEnterFullscreen(RoutingID(), player->player_id())); | 204 Send(new MediaPlayerMsg_DidEnterFullscreen(RoutingID(), player->player_id())); |
205 if (CommandLine::ForCurrentProcess()->HasSwitch( | 205 if (CommandLine::ForCurrentProcess()->HasSwitch( |
206 switches::kDisableOverlayFullscreenVideoSubtitle)) { | 206 switches::kDisableOverlayFullscreenVideoSubtitle)) { |
207 return; | 207 return; |
208 } | 208 } |
209 if (RenderWidgetHostViewAndroid* view_android = | 209 if (RenderWidgetHostViewAndroid* view_android = |
210 static_cast<RenderWidgetHostViewAndroid*>( | 210 static_cast<RenderWidgetHostViewAndroid*>( |
211 web_contents_->GetRenderWidgetHostView())) { | 211 web_contents_->GetRenderWidgetHostView())) { |
212 view_android->SetOverlayVideoMode(true); | 212 view_android->SetOverlayVideoMode(true); |
213 } | 213 } |
214 if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) | |
215 delegate->ToggleFullscreenModeForTab(web_contents_, true); | |
216 } | 214 } |
217 | 215 |
218 void BrowserMediaPlayerManager::OnMediaMetadataChanged( | 216 void BrowserMediaPlayerManager::OnMediaMetadataChanged( |
219 int player_id, base::TimeDelta duration, int width, int height, | 217 int player_id, base::TimeDelta duration, int width, int height, |
220 bool success) { | 218 bool success) { |
221 Send(new MediaPlayerMsg_MediaMetadataChanged( | 219 Send(new MediaPlayerMsg_MediaMetadataChanged( |
222 RoutingID(), player_id, duration, width, height, success)); | 220 RoutingID(), player_id, duration, width, height, success)); |
223 if (fullscreen_player_id_ == player_id) | 221 if (fullscreen_player_id_ == player_id) |
224 video_view_->UpdateMediaMetadata(); | 222 video_view_->UpdateMediaMetadata(); |
225 } | 223 } |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 #if defined(VIDEO_HOLE) | 569 #if defined(VIDEO_HOLE) |
572 MediaPlayerAndroid* player = GetPlayer(player_id); | 570 MediaPlayerAndroid* player = GetPlayer(player_id); |
573 if (player && player->IsSurfaceInUse()) | 571 if (player && player->IsSurfaceInUse()) |
574 return; | 572 return; |
575 if (external_video_surface_container_) | 573 if (external_video_surface_container_) |
576 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); | 574 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); |
577 #endif // defined(VIDEO_HOLE) | 575 #endif // defined(VIDEO_HOLE) |
578 } | 576 } |
579 | 577 |
580 } // namespace content | 578 } // namespace content |
OLD | NEW |