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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
10 #include "content/browser/frame_host/render_frame_host_impl.h" | 10 #include "content/browser/frame_host/render_frame_host_impl.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 ContentViewCore* BrowserMediaPlayerManager::GetContentViewCore() const { | 136 ContentViewCore* BrowserMediaPlayerManager::GetContentViewCore() const { |
137 return ContentViewCoreImpl::FromWebContents(web_contents()); | 137 return ContentViewCoreImpl::FromWebContents(web_contents()); |
138 } | 138 } |
139 #endif | 139 #endif |
140 | 140 |
141 MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer( | 141 MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer( |
142 const MediaPlayerHostMsg_Initialize_Params& media_player_params, | 142 const MediaPlayerHostMsg_Initialize_Params& media_player_params, |
143 bool hide_url_log, | 143 bool hide_url_log, |
144 BrowserDemuxerAndroid* demuxer) { | 144 BrowserDemuxerAndroid* demuxer) { |
145 switch (media_player_params.type) { | 145 switch (media_player_params.type) { |
| 146 case MEDIA_PLAYER_TYPE_REMOTE_ONLY: |
146 case MEDIA_PLAYER_TYPE_URL: { | 147 case MEDIA_PLAYER_TYPE_URL: { |
147 const std::string user_agent = GetContentClient()->GetUserAgent(); | 148 const std::string user_agent = GetContentClient()->GetUserAgent(); |
148 MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge( | 149 MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge( |
149 media_player_params.player_id, | 150 media_player_params.player_id, |
150 media_player_params.url, | 151 media_player_params.url, |
151 media_player_params.first_party_for_cookies, | 152 media_player_params.first_party_for_cookies, |
152 user_agent, | 153 user_agent, |
153 hide_url_log, | 154 hide_url_log, |
154 this, | 155 this, |
155 base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased, | 156 base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased, |
156 weak_ptr_factory_.GetWeakPtr()), | 157 weak_ptr_factory_.GetWeakPtr()), |
157 media_player_params.frame_url, | 158 media_player_params.frame_url, |
158 media_player_params.allow_credentials); | 159 media_player_params.allow_credentials); |
| 160 |
| 161 if (media_player_params.type == MEDIA_PLAYER_TYPE_REMOTE_ONLY) |
| 162 return media_player_bridge; |
| 163 |
159 bool should_block = false; | 164 bool should_block = false; |
160 bool extract_metadata = | 165 bool extract_metadata = |
161 // Initialize the player will cause MediaMetadataExtractor to decode | 166 // Initialize the player will cause MediaMetadataExtractor to decode |
162 // small chunks of data. | 167 // small chunks of data. |
163 RequestDecoderResources(media_player_params.player_id, true); | 168 RequestDecoderResources(media_player_params.player_id, true); |
164 #if !defined(USE_AURA) | 169 #if !defined(USE_AURA) |
165 ContentViewCoreImpl* content_view_core_impl = | 170 ContentViewCoreImpl* content_view_core_impl = |
166 static_cast<ContentViewCoreImpl*>( | 171 static_cast<ContentViewCoreImpl*>( |
167 ContentViewCore::FromWebContents(web_contents_)); | 172 ContentViewCore::FromWebContents(web_contents_)); |
168 if (!content_view_core_impl) { | 173 if (!content_view_core_impl) { |
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 if (!player) | 768 if (!player) |
764 return; | 769 return; |
765 player->Start(); | 770 player->Start(); |
766 if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) { | 771 if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) { |
767 video_view_->OpenVideo(); | 772 video_view_->OpenVideo(); |
768 fullscreen_player_is_released_ = false; | 773 fullscreen_player_is_released_ = false; |
769 } | 774 } |
770 } | 775 } |
771 | 776 |
772 } // namespace content | 777 } // namespace content |
OLD | NEW |