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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1407703003: Reland: Use GpuMemoryBufferVideoFramePool for WebMediaPlayerMS and MediaStreamVideoRendererSink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
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/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 4780 matching lines...) Expand 10 before | Expand all | Expand 10 after
4791 this, 4791 this,
4792 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(), 4792 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(),
4793 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass()); 4793 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass());
4794 #endif 4794 #endif
4795 } 4795 }
4796 4796
4797 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( 4797 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream(
4798 WebMediaPlayerClient* client) { 4798 WebMediaPlayerClient* client) {
4799 #if defined(ENABLE_WEBRTC) 4799 #if defined(ENABLE_WEBRTC)
4800 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 4800 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
4801 bool found_neon = 4801 const bool found_neon =
4802 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; 4802 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
4803 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); 4803 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
4804 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 4804 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
4805 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = 4805 RenderThreadImpl* const render_thread = RenderThreadImpl::current();
4806 RenderThreadImpl::current()->compositor_task_runner(); 4806
4807 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
4808 render_thread->compositor_task_runner();
4807 if (!compositor_task_runner.get()) 4809 if (!compositor_task_runner.get())
4808 compositor_task_runner = base::MessageLoop::current()->task_runner(); 4810 compositor_task_runner = base::MessageLoop::current()->task_runner();
4811
4809 return new WebMediaPlayerMS( 4812 return new WebMediaPlayerMS(
4810 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(), 4813 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(),
4811 CreateRendererFactory(), 4814 CreateRendererFactory(), compositor_task_runner,
4812 compositor_task_runner); 4815 render_thread->GetMediaThreadTaskRunner(),
4816 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories());
4813 #else 4817 #else
4814 return NULL; 4818 return NULL;
4815 #endif // defined(ENABLE_WEBRTC) 4819 #endif // defined(ENABLE_WEBRTC)
4816 } 4820 }
4817 4821
4818 scoped_ptr<MediaStreamRendererFactory> 4822 scoped_ptr<MediaStreamRendererFactory>
4819 RenderFrameImpl::CreateRendererFactory() { 4823 RenderFrameImpl::CreateRendererFactory() {
4820 scoped_ptr<MediaStreamRendererFactory> factory = 4824 scoped_ptr<MediaStreamRendererFactory> factory =
4821 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); 4825 GetContentClient()->renderer()->CreateMediaStreamRendererFactory();
4822 if (factory.get()) 4826 if (factory.get())
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
5197 mojo::ServiceProviderPtr service_provider; 5201 mojo::ServiceProviderPtr service_provider;
5198 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5202 mojo::URLRequestPtr request(mojo::URLRequest::New());
5199 request->url = mojo::String::From(url); 5203 request->url = mojo::String::From(url);
5200 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5204 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5201 nullptr, nullptr, 5205 nullptr, nullptr,
5202 base::Bind(&OnGotContentHandlerID)); 5206 base::Bind(&OnGotContentHandlerID));
5203 return service_provider.Pass(); 5207 return service_provider.Pass();
5204 } 5208 }
5205 5209
5206 } // namespace content 5210 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | content/shell/renderer/layout_test/test_media_stream_renderer_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698