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/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/legacy_media_source_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::LegacyMediaSourcePlayer; | |
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 Loading... | |
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 MediaSourcePlayer( |
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 LegacyMediaSourcePlayer( | |
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); | |
xhwang
2015/04/29 23:50:51
nit: Use braces for complicated if/else statements
timav
2015/04/30 21:18:50
Done.
| |
123 } | 135 } |
124 } | 136 } |
125 | 137 |
126 NOTREACHED(); | 138 NOTREACHED(); |
127 return NULL; | 139 return NULL; |
128 } | 140 } |
129 | 141 |
130 BrowserMediaPlayerManager::BrowserMediaPlayerManager( | 142 BrowserMediaPlayerManager::BrowserMediaPlayerManager( |
131 RenderFrameHost* render_frame_host, | 143 RenderFrameHost* render_frame_host, |
132 MediaPlayersObserver* audio_monitor) | 144 MediaPlayersObserver* audio_monitor) |
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
600 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); | 612 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); |
601 #endif // defined(VIDEO_HOLE) | 613 #endif // defined(VIDEO_HOLE) |
602 } | 614 } |
603 | 615 |
604 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { | 616 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { |
605 player->Release(); | 617 player->Release(); |
606 ReleaseMediaResources(player->player_id()); | 618 ReleaseMediaResources(player->player_id()); |
607 } | 619 } |
608 | 620 |
609 } // namespace content | 621 } // namespace content |
OLD | NEW |