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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1320183003: Preliminary change for new rtc rendering algorithm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Consider capture buffer contention 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f5d90c62c10cfa3267f72f938a5122b6eb5c275a..a856f876857c3b284297c9c833c39a38318c2ab7 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4735,9 +4735,14 @@ WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream(
(android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
#endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
- return new WebMediaPlayerMS(frame_, client, weak_factory_.GetWeakPtr(),
- new RenderMediaLog(),
- CreateRendererFactory());
+ scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
+ RenderThreadImpl::current()->compositor_task_runner();
+ if (!compositor_task_runner.get())
+ compositor_task_runner = base::MessageLoop::current()->task_runner();
+ return new WebMediaPlayerMS(
+ frame_, client, weak_factory_.GetWeakPtr(), new RenderMediaLog(),
+ CreateRendererFactory(),
+ compositor_task_runner);
#else
return NULL;
#endif // defined(ENABLE_WEBRTC)
« 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