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

Side by Side Diff: content/renderer/media/media_stream_renderer_factory_impl.cc

Issue 2472273002: Move passing of WebRTC rendering frames from main thread to compositor thread (Closed)
Patch Set: wez@ nits. Created 4 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/media/media_stream_renderer_factory_impl.h" 5 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/renderer/media/media_stream.h" 8 #include "content/renderer/media/media_stream.h"
9 #include "content/renderer/media/media_stream_audio_track.h" 9 #include "content/renderer/media/media_stream_audio_track.h"
10 #include "content/renderer/media/media_stream_video_renderer_sink.h" 10 #include "content/renderer/media/media_stream_video_renderer_sink.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 55
56 MediaStreamRendererFactoryImpl::~MediaStreamRendererFactoryImpl() { 56 MediaStreamRendererFactoryImpl::~MediaStreamRendererFactoryImpl() {
57 } 57 }
58 58
59 scoped_refptr<MediaStreamVideoRenderer> 59 scoped_refptr<MediaStreamVideoRenderer>
60 MediaStreamRendererFactoryImpl::GetVideoRenderer( 60 MediaStreamRendererFactoryImpl::GetVideoRenderer(
61 const blink::WebMediaStream& web_stream, 61 const blink::WebMediaStream& web_stream,
62 const base::Closure& error_cb, 62 const base::Closure& error_cb,
63 const MediaStreamVideoRenderer::RepaintCB& repaint_cb, 63 const MediaStreamVideoRenderer::RepaintCB& repaint_cb,
64 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
64 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 65 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
65 const scoped_refptr<base::TaskRunner>& worker_task_runner, 66 const scoped_refptr<base::TaskRunner>& worker_task_runner,
66 media::GpuVideoAcceleratorFactories* gpu_factories) { 67 media::GpuVideoAcceleratorFactories* gpu_factories) {
67 DCHECK(!web_stream.isNull()); 68 DCHECK(!web_stream.isNull());
68 69
69 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:" 70 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:"
70 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); 71 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id()));
71 72
72 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; 73 blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
73 web_stream.videoTracks(video_tracks); 74 web_stream.videoTracks(video_tracks);
74 if (video_tracks.isEmpty() || 75 if (video_tracks.isEmpty() ||
75 !MediaStreamVideoTrack::GetTrack(video_tracks[0])) { 76 !MediaStreamVideoTrack::GetTrack(video_tracks[0])) {
76 return NULL; 77 return NULL;
77 } 78 }
78 79
79 return new MediaStreamVideoRendererSink(video_tracks[0], error_cb, repaint_cb, 80 return new MediaStreamVideoRendererSink(
80 media_task_runner, worker_task_runner, 81 video_tracks[0], error_cb, repaint_cb, compositor_task_runner,
81 gpu_factories); 82 media_task_runner, worker_task_runner, gpu_factories);
82 } 83 }
83 84
84 scoped_refptr<MediaStreamAudioRenderer> 85 scoped_refptr<MediaStreamAudioRenderer>
85 MediaStreamRendererFactoryImpl::GetAudioRenderer( 86 MediaStreamRendererFactoryImpl::GetAudioRenderer(
86 const blink::WebMediaStream& web_stream, 87 const blink::WebMediaStream& web_stream,
87 int render_frame_id, 88 int render_frame_id,
88 const std::string& device_id, 89 const std::string& device_id,
89 const url::Origin& security_origin) { 90 const url::Origin& security_origin) {
90 DCHECK(!web_stream.isNull()); 91 DCHECK(!web_stream.isNull());
91 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; 92 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 device_id, security_origin); 143 device_id, security_origin);
143 144
144 if (!audio_device->SetAudioRenderer(renderer.get())) 145 if (!audio_device->SetAudioRenderer(renderer.get()))
145 return nullptr; 146 return nullptr;
146 } 147 }
147 148
148 return renderer->CreateSharedAudioRendererProxy(web_stream); 149 return renderer->CreateSharedAudioRendererProxy(web_stream);
149 } 150 }
150 151
151 } // namespace content 152 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698