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

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: 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 4713 matching lines...) Expand 10 before | Expand all | Expand 10 after
4724 this, 4724 this,
4725 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(), 4725 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(),
4726 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass()); 4726 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass());
4727 #endif 4727 #endif
4728 } 4728 }
4729 4729
4730 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( 4730 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream(
4731 WebMediaPlayerClient* client) { 4731 WebMediaPlayerClient* client) {
4732 #if defined(ENABLE_WEBRTC) 4732 #if defined(ENABLE_WEBRTC)
4733 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 4733 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
4734 bool found_neon = 4734 bool found_neon =
mcasas 2015/10/02 19:30:46 const :) :)
emircan 2015/10/03 00:11:26 Done.
4735 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; 4735 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
4736 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); 4736 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
4737 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 4737 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
4738 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = 4738 RenderThreadImpl* render_thread = RenderThreadImpl::current();
mcasas 2015/10/02 19:30:46 Gosh more static methods! Is this OK with unit tes
emircan 2015/10/03 00:11:26 Well the earlier usage on l.4739 worked, so I am a
4739 RenderThreadImpl::current()->compositor_task_runner(); 4739
4740 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
4741 render_thread->compositor_task_runner();
4740 if (!compositor_task_runner.get()) 4742 if (!compositor_task_runner.get())
4741 compositor_task_runner = base::MessageLoop::current()->task_runner(); 4743 compositor_task_runner = base::MessageLoop::current()->task_runner();
4744
4742 return new WebMediaPlayerMS( 4745 return new WebMediaPlayerMS(
4743 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(), 4746 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(),
4744 CreateRendererFactory(), 4747 CreateRendererFactory(), compositor_task_runner,
4745 compositor_task_runner); 4748 render_thread->GetMediaThreadTaskRunner(),
4749 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories());
4746 #else 4750 #else
4747 return NULL; 4751 return NULL;
4748 #endif // defined(ENABLE_WEBRTC) 4752 #endif // defined(ENABLE_WEBRTC)
4749 } 4753 }
4750 4754
4751 scoped_ptr<MediaStreamRendererFactory> 4755 scoped_ptr<MediaStreamRendererFactory>
4752 RenderFrameImpl::CreateRendererFactory() { 4756 RenderFrameImpl::CreateRendererFactory() {
4753 scoped_ptr<MediaStreamRendererFactory> factory = 4757 scoped_ptr<MediaStreamRendererFactory> factory =
4754 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); 4758 GetContentClient()->renderer()->CreateMediaStreamRendererFactory();
4755 if (factory.get()) 4759 if (factory.get())
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
5105 mojo::ServiceProviderPtr service_provider; 5109 mojo::ServiceProviderPtr service_provider;
5106 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5110 mojo::URLRequestPtr request(mojo::URLRequest::New());
5107 request->url = mojo::String::From(url); 5111 request->url = mojo::String::From(url);
5108 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5112 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5109 nullptr, nullptr, 5113 nullptr, nullptr,
5110 base::Bind(&OnGotContentHandlerID)); 5114 base::Bind(&OnGotContentHandlerID));
5111 return service_provider.Pass(); 5115 return service_provider.Pass();
5112 } 5116 }
5113 5117
5114 } // namespace content 5118 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698