Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: content/browser/media/android/browser_media_player_manager.cc

Issue 1076013002: Added stub MediaSourcePlayer for developing behind the flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed clang build Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/media/android/browser_demuxer_android.cc ('k') | media/base/android/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/android/media_players_observer.h" 10 #include "content/browser/android/media_players_observer.h"
11 #include "content/browser/media/android/browser_demuxer_android.h" 11 #include "content/browser/media/android/browser_demuxer_android.h"
12 #include "content/browser/media/android/media_resource_getter_impl.h" 12 #include "content/browser/media/android/media_resource_getter_impl.h"
13 #include "content/browser/renderer_host/render_view_host_impl.h" 13 #include "content/browser/renderer_host/render_view_host_impl.h"
14 #include "content/browser/web_contents/web_contents_view_android.h" 14 #include "content/browser/web_contents/web_contents_view_android.h"
15 #include "content/common/media/media_player_messages_android.h" 15 #include "content/common/media/media_player_messages_android.h"
16 #include "content/public/browser/android/content_view_core.h" 16 #include "content/public/browser/android/content_view_core.h"
17 #include "content/public/browser/android/external_video_surface_container.h" 17 #include "content/public/browser/android/external_video_surface_container.h"
18 #include "content/public/browser/browser_context.h" 18 #include "content/public/browser/browser_context.h"
19 #include "content/public/browser/content_browser_client.h" 19 #include "content/public/browser/content_browser_client.h"
20 #include "content/public/browser/render_frame_host.h" 20 #include "content/public/browser/render_frame_host.h"
21 #include "content/public/browser/render_process_host.h" 21 #include "content/public/browser/render_process_host.h"
22 #include "content/public/browser/render_view_host.h" 22 #include "content/public/browser/render_view_host.h"
23 #include "content/public/browser/storage_partition.h" 23 #include "content/public/browser/storage_partition.h"
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "content/public/browser/web_contents_delegate.h" 25 #include "content/public/browser/web_contents_delegate.h"
26 #include "content/public/common/content_client.h" 26 #include "content/public/common/content_client.h"
27 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
28 #include "media/base/android/media_codec_player.h"
28 #include "media/base/android/media_player_bridge.h" 29 #include "media/base/android/media_player_bridge.h"
29 #include "media/base/android/media_source_player.h" 30 #include "media/base/android/media_source_player.h"
30 #include "media/base/android/media_url_interceptor.h" 31 #include "media/base/android/media_url_interceptor.h"
31 #include "media/base/media_switches.h" 32 #include "media/base/media_switches.h"
32 33
34 using media::MediaCodecPlayer;
33 using media::MediaPlayerAndroid; 35 using media::MediaPlayerAndroid;
34 using media::MediaPlayerBridge; 36 using media::MediaPlayerBridge;
35 using media::MediaPlayerManager; 37 using media::MediaPlayerManager;
36 using media::MediaSourcePlayer; 38 using media::MediaSourcePlayer;
37 39
38 namespace content { 40 namespace content {
39 41
40 // Threshold on the number of media players per renderer before we start 42 // Threshold on the number of media players per renderer before we start
41 // attempting to release inactive media players. 43 // attempting to release inactive media players.
42 const int kMediaPlayerThreshold = 1; 44 const int kMediaPlayerThreshold = 1;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 browser_media_player_manager->OnMediaMetadataChanged( 108 browser_media_player_manager->OnMediaMetadataChanged(
107 media_player_params.player_id, base::TimeDelta(), 0, 0, false); 109 media_player_params.player_id, base::TimeDelta(), 0, 0, false);
108 } else if (!content_view_core_impl->ShouldBlockMediaRequest( 110 } else if (!content_view_core_impl->ShouldBlockMediaRequest(
109 media_player_params.url)) { 111 media_player_params.url)) {
110 media_player_bridge->Initialize(); 112 media_player_bridge->Initialize();
111 } 113 }
112 return media_player_bridge; 114 return media_player_bridge;
113 } 115 }
114 116
115 case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: { 117 case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: {
116 return new MediaSourcePlayer( 118 if (base::CommandLine::ForCurrentProcess()->
117 media_player_params.player_id, 119 HasSwitch(switches::kEnableMediaThreadForMediaPlayback)) {
118 manager, 120 return new MediaCodecPlayer(
119 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested, 121 media_player_params.player_id,
120 weak_ptr_factory_.GetWeakPtr()), 122 manager,
121 demuxer->CreateDemuxer(media_player_params.demuxer_client_id), 123 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
122 media_player_params.frame_url); 124 weak_ptr_factory_.GetWeakPtr()),
125 demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
126 media_player_params.frame_url);
127 } else {
128 return new MediaSourcePlayer(
129 media_player_params.player_id,
130 manager,
131 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
132 weak_ptr_factory_.GetWeakPtr()),
133 demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
134 media_player_params.frame_url);
135 }
123 } 136 }
124 } 137 }
125 138
126 NOTREACHED(); 139 NOTREACHED();
127 return NULL; 140 return NULL;
128 } 141 }
129 142
130 BrowserMediaPlayerManager::BrowserMediaPlayerManager( 143 BrowserMediaPlayerManager::BrowserMediaPlayerManager(
131 RenderFrameHost* render_frame_host, 144 RenderFrameHost* render_frame_host,
132 MediaPlayersObserver* audio_monitor) 145 MediaPlayersObserver* audio_monitor)
133 : render_frame_host_(render_frame_host), 146 : render_frame_host_(render_frame_host),
134 audio_monitor_(audio_monitor), 147 audio_monitor_(audio_monitor),
135 fullscreen_player_id_(kInvalidMediaPlayerId), 148 fullscreen_player_id_(kInvalidMediaPlayerId),
136 fullscreen_player_is_released_(false), 149 fullscreen_player_is_released_(false),
137 web_contents_(WebContents::FromRenderFrameHost(render_frame_host)), 150 web_contents_(WebContents::FromRenderFrameHost(render_frame_host)),
138 weak_ptr_factory_(this) { 151 weak_ptr_factory_(this) {
139 } 152 }
140 153
141 BrowserMediaPlayerManager::~BrowserMediaPlayerManager() { 154 BrowserMediaPlayerManager::~BrowserMediaPlayerManager() {
142 // During the tear down process, OnDestroyPlayer() may or may not be called 155 // During the tear down process, OnDestroyPlayer() may or may not be called
143 // (e.g. the WebContents may be destroyed before the render process). So 156 // (e.g. the WebContents may be destroyed before the render process). So
144 // we cannot DCHECK(players_.empty()) here. Instead, all media players in 157 // we cannot DCHECK(players_.empty()) here. Instead, all media players in
145 // |players_| will be destroyed here because |player_| is a ScopedVector. 158 // |players_| will be destroyed here because |player_| is a ScopedVector.
159
160 for (MediaPlayerAndroid* player : players_)
161 player->DeleteOnCorrectThread();
162
163 players_.weak_clear();
146 } 164 }
147 165
148 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { 166 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) {
149 if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) 167 if (WebContentsDelegate* delegate = web_contents_->GetDelegate())
150 delegate->ExitFullscreenModeForTab(web_contents_); 168 delegate->ExitFullscreenModeForTab(web_contents_);
151 if (RenderWidgetHostViewAndroid* view_android = 169 if (RenderWidgetHostViewAndroid* view_android =
152 static_cast<RenderWidgetHostViewAndroid*>( 170 static_cast<RenderWidgetHostViewAndroid*>(
153 web_contents_->GetRenderWidgetHostView())) { 171 web_contents_->GetRenderWidgetHostView())) {
154 view_android->SetOverlayVideoMode(false); 172 view_android->SetOverlayVideoMode(false);
155 } 173 }
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 void BrowserMediaPlayerManager::AddPlayer(MediaPlayerAndroid* player) { 541 void BrowserMediaPlayerManager::AddPlayer(MediaPlayerAndroid* player) {
524 DCHECK(!GetPlayer(player->player_id())); 542 DCHECK(!GetPlayer(player->player_id()));
525 players_.push_back(player); 543 players_.push_back(player);
526 } 544 }
527 545
528 void BrowserMediaPlayerManager::RemovePlayer(int player_id) { 546 void BrowserMediaPlayerManager::RemovePlayer(int player_id) {
529 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); 547 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
530 it != players_.end(); ++it) { 548 it != players_.end(); ++it) {
531 if ((*it)->player_id() == player_id) { 549 if ((*it)->player_id() == player_id) {
532 ReleaseMediaResources(player_id); 550 ReleaseMediaResources(player_id);
533 players_.erase(it); 551 (*it)->DeleteOnCorrectThread();
552 players_.weak_erase(it);
534 audio_monitor_->RemovePlayer(render_frame_host_, player_id); 553 audio_monitor_->RemovePlayer(render_frame_host_, player_id);
535 break; 554 break;
536 } 555 }
537 } 556 }
538 } 557 }
539 558
540 scoped_ptr<media::MediaPlayerAndroid> BrowserMediaPlayerManager::SwapPlayer( 559 scoped_ptr<media::MediaPlayerAndroid> BrowserMediaPlayerManager::SwapPlayer(
541 int player_id, media::MediaPlayerAndroid* player) { 560 int player_id, media::MediaPlayerAndroid* player) {
542 media::MediaPlayerAndroid* previous_player = NULL; 561 media::MediaPlayerAndroid* previous_player = NULL;
543 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); 562 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); 619 external_video_surface_container_->ReleaseExternalVideoSurface(player_id);
601 #endif // defined(VIDEO_HOLE) 620 #endif // defined(VIDEO_HOLE)
602 } 621 }
603 622
604 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { 623 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) {
605 player->Release(); 624 player->Release();
606 ReleaseMediaResources(player->player_id()); 625 ReleaseMediaResources(player->player_id());
607 } 626 }
608 627
609 } // namespace content 628 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/android/browser_demuxer_android.cc ('k') | media/base/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698