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

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

Issue 1358883003: Use GpuMemoryBufferVideoFramePool for WebMediaPlayerMS and MediaStreamVideoRendererSink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@send-gmbs
Patch Set: phoglund@ comments. 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 4798 matching lines...) Expand 10 before | Expand all | Expand 10 after
4809 this, 4809 this,
4810 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(), 4810 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(),
4811 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass()); 4811 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass());
4812 #endif 4812 #endif
4813 } 4813 }
4814 4814
4815 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( 4815 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream(
4816 WebMediaPlayerClient* client) { 4816 WebMediaPlayerClient* client) {
4817 #if defined(ENABLE_WEBRTC) 4817 #if defined(ENABLE_WEBRTC)
4818 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 4818 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
4819 bool found_neon = 4819 const bool found_neon =
4820 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; 4820 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
4821 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); 4821 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
4822 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 4822 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
4823 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = 4823 RenderThreadImpl* const render_thread = RenderThreadImpl::current();
4824 RenderThreadImpl::current()->compositor_task_runner(); 4824
4825 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
4826 render_thread->compositor_task_runner();
4825 if (!compositor_task_runner.get()) 4827 if (!compositor_task_runner.get())
4826 compositor_task_runner = base::MessageLoop::current()->task_runner(); 4828 compositor_task_runner = base::MessageLoop::current()->task_runner();
4829
4827 return new WebMediaPlayerMS( 4830 return new WebMediaPlayerMS(
4828 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(), 4831 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(),
4829 CreateRendererFactory(), 4832 CreateRendererFactory(), compositor_task_runner,
4830 compositor_task_runner); 4833 render_thread->GetMediaThreadTaskRunner(),
4834 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories());
4831 #else 4835 #else
4832 return NULL; 4836 return NULL;
4833 #endif // defined(ENABLE_WEBRTC) 4837 #endif // defined(ENABLE_WEBRTC)
4834 } 4838 }
4835 4839
4836 scoped_ptr<MediaStreamRendererFactory> 4840 scoped_ptr<MediaStreamRendererFactory>
4837 RenderFrameImpl::CreateRendererFactory() { 4841 RenderFrameImpl::CreateRendererFactory() {
4838 scoped_ptr<MediaStreamRendererFactory> factory = 4842 scoped_ptr<MediaStreamRendererFactory> factory =
4839 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); 4843 GetContentClient()->renderer()->CreateMediaStreamRendererFactory();
4840 if (factory.get()) 4844 if (factory.get())
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
5215 mojo::ServiceProviderPtr service_provider(21); 5219 mojo::ServiceProviderPtr service_provider(21);
5216 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5220 mojo::URLRequestPtr request(mojo::URLRequest::New());
5217 request->url = mojo::String::From(url); 5221 request->url = mojo::String::From(url);
5218 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5222 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5219 nullptr, nullptr, 5223 nullptr, nullptr,
5220 base::Bind(&OnGotContentHandlerID)); 5224 base::Bind(&OnGotContentHandlerID));
5221 return service_provider.Pass(); 5225 return service_provider.Pass();
5222 } 5226 }
5223 5227
5224 } // namespace content 5228 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698