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

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

Issue 1321753002: Revert of Preliminary change for new rtc rendering algorithm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 4684 matching lines...) Expand 10 before | Expand all | Expand 10 after
4695 } 4695 }
4696 4696
4697 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( 4697 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream(
4698 WebMediaPlayerClient* client) { 4698 WebMediaPlayerClient* client) {
4699 #if defined(ENABLE_WEBRTC) 4699 #if defined(ENABLE_WEBRTC)
4700 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 4700 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
4701 bool found_neon = 4701 bool found_neon =
4702 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; 4702 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
4703 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); 4703 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
4704 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 4704 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
4705 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = 4705 return new WebMediaPlayerMS(frame_, client, weak_factory_.GetWeakPtr(),
4706 RenderThreadImpl::current()->compositor_task_runner(); 4706 new RenderMediaLog(),
4707 if (!compositor_task_runner.get()) 4707 CreateRendererFactory());
4708 compositor_task_runner = base::MessageLoop::current()->task_runner();
4709 return new WebMediaPlayerMS(
4710 frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(),
4711 CreateRendererFactory(),
4712 compositor_task_runner);
4713 #else 4708 #else
4714 return NULL; 4709 return NULL;
4715 #endif // defined(ENABLE_WEBRTC) 4710 #endif // defined(ENABLE_WEBRTC)
4716 } 4711 }
4717 4712
4718 scoped_ptr<MediaStreamRendererFactory> 4713 scoped_ptr<MediaStreamRendererFactory>
4719 RenderFrameImpl::CreateRendererFactory() { 4714 RenderFrameImpl::CreateRendererFactory() {
4720 scoped_ptr<MediaStreamRendererFactory> factory = 4715 scoped_ptr<MediaStreamRendererFactory> factory =
4721 GetContentClient()->renderer()->CreateMediaStreamRendererFactory(); 4716 GetContentClient()->renderer()->CreateMediaStreamRendererFactory();
4722 if (factory.get()) 4717 if (factory.get())
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
5074 void RenderFrameImpl::RegisterMojoServices() { 5069 void RenderFrameImpl::RegisterMojoServices() {
5075 // Only main frame have ImageDownloader service. 5070 // Only main frame have ImageDownloader service.
5076 if (!frame_->parent()) { 5071 if (!frame_->parent()) {
5077 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( 5072 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
5078 base::Bind(&ImageDownloaderImpl::CreateMojoService, 5073 base::Bind(&ImageDownloaderImpl::CreateMojoService,
5079 base::Unretained(this))); 5074 base::Unretained(this)));
5080 } 5075 }
5081 } 5076 }
5082 5077
5083 } // namespace content 5078 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc/media_stream_remote_video_source.cc ('k') | media/base/video_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698