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 4774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4785 this, | 4785 this, |
4786 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(), | 4786 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(), |
4787 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass()); | 4787 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass()); |
4788 #endif | 4788 #endif |
4789 } | 4789 } |
4790 | 4790 |
4791 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( | 4791 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( |
4792 WebMediaPlayerClient* client) { | 4792 WebMediaPlayerClient* client) { |
4793 #if defined(ENABLE_WEBRTC) | 4793 #if defined(ENABLE_WEBRTC) |
4794 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) | 4794 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
4795 bool found_neon = | 4795 const bool found_neon = |
4796 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; | 4796 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; |
4797 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); | 4797 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); |
4798 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) | 4798 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
4799 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = | 4799 RenderThreadImpl* const render_thread = RenderThreadImpl::current(); |
4800 RenderThreadImpl::current()->compositor_task_runner(); | 4800 |
| 4801 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = |
| 4802 render_thread->compositor_task_runner(); |
4801 if (!compositor_task_runner.get()) | 4803 if (!compositor_task_runner.get()) |
4802 compositor_task_runner = base::MessageLoop::current()->task_runner(); | 4804 compositor_task_runner = base::MessageLoop::current()->task_runner(); |
| 4805 |
4803 return new WebMediaPlayerMS( | 4806 return new WebMediaPlayerMS( |
4804 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(), | 4807 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(), |
4805 CreateRendererFactory(), | 4808 CreateRendererFactory(), compositor_task_runner, |
4806 compositor_task_runner); | 4809 render_thread->GetMediaThreadTaskRunner(), |
| 4810 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories()); |
4807 #else | 4811 #else |
4808 return NULL; | 4812 return NULL; |
4809 #endif // defined(ENABLE_WEBRTC) | 4813 #endif // defined(ENABLE_WEBRTC) |
4810 } | 4814 } |
4811 | 4815 |
4812 scoped_ptr<MediaStreamRendererFactory> | 4816 scoped_ptr<MediaStreamRendererFactory> |
4813 RenderFrameImpl::CreateRendererFactory() { | 4817 RenderFrameImpl::CreateRendererFactory() { |
4814 scoped_ptr<MediaStreamRendererFactory> factory = | 4818 scoped_ptr<MediaStreamRendererFactory> factory = |
4815 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); | 4819 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); |
4816 if (factory.get()) | 4820 if (factory.get()) |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5173 mojo::ServiceProviderPtr service_provider; | 5177 mojo::ServiceProviderPtr service_provider; |
5174 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5178 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5175 request->url = mojo::String::From(url); | 5179 request->url = mojo::String::From(url); |
5176 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5180 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5177 nullptr, nullptr, | 5181 nullptr, nullptr, |
5178 base::Bind(&OnGotContentHandlerID)); | 5182 base::Bind(&OnGotContentHandlerID)); |
5179 return service_provider.Pass(); | 5183 return service_provider.Pass(); |
5180 } | 5184 } |
5181 | 5185 |
5182 } // namespace content | 5186 } // namespace content |
OLD | NEW |