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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 5174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5185 #if defined(OS_ANDROID) | 5185 #if defined(OS_ANDROID) |
5186 WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer( | 5186 WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer( |
5187 WebMediaPlayerClient* client, | 5187 WebMediaPlayerClient* client, |
5188 WebMediaPlayerEncryptedMediaClient* encrypted_client, | 5188 WebMediaPlayerEncryptedMediaClient* encrypted_client, |
5189 const media::WebMediaPlayerParams& params) { | 5189 const media::WebMediaPlayerParams& params) { |
5190 scoped_refptr<StreamTextureFactory> stream_texture_factory; | 5190 scoped_refptr<StreamTextureFactory> stream_texture_factory; |
5191 if (SynchronousCompositorFactory* factory = | 5191 if (SynchronousCompositorFactory* factory = |
5192 SynchronousCompositorFactory::GetInstance()) { | 5192 SynchronousCompositorFactory::GetInstance()) { |
5193 stream_texture_factory = factory->CreateStreamTextureFactory(routing_id_); | 5193 stream_texture_factory = factory->CreateStreamTextureFactory(routing_id_); |
5194 } else { | 5194 } else { |
5195 GpuChannelHost* gpu_channel_host = | 5195 stream_texture_factory = |
5196 RenderThreadImpl::current()->EstablishGpuChannelSync( | 5196 RenderThreadImpl::current()->GetStreamTexureFactory(); |
5197 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | |
5198 | |
5199 if (!gpu_channel_host) { | |
5200 LOG(ERROR) << "Failed to establish GPU channel for media player"; | |
5201 return NULL; | |
5202 } | |
5203 | |
5204 scoped_refptr<cc_blink::ContextProviderWebContext> context_provider = | |
5205 RenderThreadImpl::current()->SharedMainThreadContextProvider(); | |
5206 | |
5207 if (!context_provider.get()) { | |
5208 LOG(ERROR) << "Failed to get context3d for media player"; | |
5209 return NULL; | |
5210 } | |
5211 | |
5212 stream_texture_factory = StreamTextureFactoryImpl::Create( | |
5213 context_provider, gpu_channel_host, routing_id_); | |
5214 } | 5197 } |
5215 | 5198 |
5216 return new WebMediaPlayerAndroid( | 5199 return new WebMediaPlayerAndroid(frame_, client, encrypted_client, |
5217 frame_, client, encrypted_client, weak_factory_.GetWeakPtr(), | 5200 weak_factory_.GetWeakPtr(), |
5218 GetMediaPlayerManager(), GetCdmFactory(), stream_texture_factory, params); | 5201 GetMediaPlayerManager(), GetCdmFactory(), |
| 5202 stream_texture_factory, routing_id_, params); |
5219 } | 5203 } |
5220 | 5204 |
5221 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { | 5205 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { |
5222 if (!media_player_manager_) | 5206 if (!media_player_manager_) |
5223 media_player_manager_ = new RendererMediaPlayerManager(this); | 5207 media_player_manager_ = new RendererMediaPlayerManager(this); |
5224 return media_player_manager_; | 5208 return media_player_manager_; |
5225 } | 5209 } |
5226 #endif // defined(OS_ANDROID) | 5210 #endif // defined(OS_ANDROID) |
5227 | 5211 |
5228 scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy( | 5212 scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy( |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5312 mojo::ServiceProviderPtr service_provider; | 5296 mojo::ServiceProviderPtr service_provider; |
5313 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5297 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5314 request->url = mojo::String::From(url); | 5298 request->url = mojo::String::From(url); |
5315 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5299 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5316 nullptr, nullptr, | 5300 nullptr, nullptr, |
5317 base::Bind(&OnGotContentHandlerID)); | 5301 base::Bind(&OnGotContentHandlerID)); |
5318 return service_provider.Pass(); | 5302 return service_provider.Pass(); |
5319 } | 5303 } |
5320 | 5304 |
5321 } // namespace content | 5305 } // namespace content |
OLD | NEW |