OLD | NEW |
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_video_renderer_sink.h" | 9 #include "content/renderer/media/media_stream_video_renderer_sink.h" |
10 #include "content/renderer/media/media_stream_video_track.h" | 10 #include "content/renderer/media/media_stream_video_track.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 MediaStreamRendererFactoryImpl::MediaStreamRendererFactoryImpl() { | 107 MediaStreamRendererFactoryImpl::MediaStreamRendererFactoryImpl() { |
108 } | 108 } |
109 | 109 |
110 MediaStreamRendererFactoryImpl::~MediaStreamRendererFactoryImpl() { | 110 MediaStreamRendererFactoryImpl::~MediaStreamRendererFactoryImpl() { |
111 } | 111 } |
112 | 112 |
113 scoped_refptr<VideoFrameProvider> | 113 scoped_refptr<VideoFrameProvider> |
114 MediaStreamRendererFactoryImpl::GetVideoFrameProvider( | 114 MediaStreamRendererFactoryImpl::GetVideoFrameProvider( |
115 const GURL& url, | 115 const GURL& url, |
116 const base::Closure& error_cb, | 116 const base::Closure& error_cb, |
117 const VideoFrameProvider::RepaintCB& repaint_cb) { | 117 const VideoFrameProvider::RepaintCB& repaint_cb, |
| 118 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 119 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
| 120 const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories) { |
118 blink::WebMediaStream web_stream = | 121 blink::WebMediaStream web_stream = |
119 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url); | 122 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url); |
120 DCHECK(!web_stream.isNull()); | 123 DCHECK(!web_stream.isNull()); |
121 | 124 |
122 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoFrameProvider stream:" | 125 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoFrameProvider stream:" |
123 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); | 126 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); |
124 | 127 |
125 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; | 128 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; |
126 web_stream.videoTracks(video_tracks); | 129 web_stream.videoTracks(video_tracks); |
127 if (video_tracks.isEmpty() || | 130 if (video_tracks.isEmpty() || |
128 !MediaStreamVideoTrack::GetTrack(video_tracks[0])) { | 131 !MediaStreamVideoTrack::GetTrack(video_tracks[0])) { |
129 return NULL; | 132 return NULL; |
130 } | 133 } |
131 | 134 |
132 return new MediaStreamVideoRendererSink(video_tracks[0], error_cb, | 135 return new MediaStreamVideoRendererSink(video_tracks[0], error_cb, repaint_cb, |
133 repaint_cb); | 136 media_task_runner, worker_task_runner, |
| 137 gpu_factories); |
134 } | 138 } |
135 | 139 |
136 scoped_refptr<MediaStreamAudioRenderer> | 140 scoped_refptr<MediaStreamAudioRenderer> |
137 MediaStreamRendererFactoryImpl::GetAudioRenderer(const GURL& url, | 141 MediaStreamRendererFactoryImpl::GetAudioRenderer(const GURL& url, |
138 int render_frame_id) { | 142 int render_frame_id) { |
139 blink::WebMediaStream web_stream = | 143 blink::WebMediaStream web_stream = |
140 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url); | 144 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url); |
141 | 145 |
142 if (web_stream.isNull() || !web_stream.extraData()) | 146 if (web_stream.isNull() || !web_stream.extraData()) |
143 return NULL; // This is not a valid stream. | 147 return NULL; // This is not a valid stream. |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 | 188 |
185 if (renderer.get() && !audio_device->SetAudioRenderer(renderer.get())) | 189 if (renderer.get() && !audio_device->SetAudioRenderer(renderer.get())) |
186 renderer = NULL; | 190 renderer = NULL; |
187 } | 191 } |
188 | 192 |
189 return renderer.get() ? | 193 return renderer.get() ? |
190 renderer->CreateSharedAudioRendererProxy(stream) : NULL; | 194 renderer->CreateSharedAudioRendererProxy(stream) : NULL; |
191 } | 195 } |
192 | 196 |
193 } // namespace content | 197 } // namespace content |
OLD | NEW |