| 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_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 Loading... |
| 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, | |
| 65 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 64 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 66 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 65 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
| 67 media::GpuVideoAcceleratorFactories* gpu_factories) { | 66 media::GpuVideoAcceleratorFactories* gpu_factories) { |
| 68 DCHECK(!web_stream.isNull()); | 67 DCHECK(!web_stream.isNull()); |
| 69 | 68 |
| 70 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:" | 69 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:" |
| 71 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); | 70 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); |
| 72 | 71 |
| 73 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; | 72 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; |
| 74 web_stream.videoTracks(video_tracks); | 73 web_stream.videoTracks(video_tracks); |
| 75 if (video_tracks.isEmpty() || | 74 if (video_tracks.isEmpty() || |
| 76 !MediaStreamVideoTrack::GetTrack(video_tracks[0])) { | 75 !MediaStreamVideoTrack::GetTrack(video_tracks[0])) { |
| 77 return NULL; | 76 return NULL; |
| 78 } | 77 } |
| 79 | 78 |
| 80 return new MediaStreamVideoRendererSink( | 79 return new MediaStreamVideoRendererSink(video_tracks[0], error_cb, repaint_cb, |
| 81 video_tracks[0], error_cb, repaint_cb, compositor_task_runner, | 80 media_task_runner, worker_task_runner, |
| 82 media_task_runner, worker_task_runner, gpu_factories); | 81 gpu_factories); |
| 83 } | 82 } |
| 84 | 83 |
| 85 scoped_refptr<MediaStreamAudioRenderer> | 84 scoped_refptr<MediaStreamAudioRenderer> |
| 86 MediaStreamRendererFactoryImpl::GetAudioRenderer( | 85 MediaStreamRendererFactoryImpl::GetAudioRenderer( |
| 87 const blink::WebMediaStream& web_stream, | 86 const blink::WebMediaStream& web_stream, |
| 88 int render_frame_id, | 87 int render_frame_id, |
| 89 const std::string& device_id, | 88 const std::string& device_id, |
| 90 const url::Origin& security_origin) { | 89 const url::Origin& security_origin) { |
| 91 DCHECK(!web_stream.isNull()); | 90 DCHECK(!web_stream.isNull()); |
| 92 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; | 91 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 device_id, security_origin); | 142 device_id, security_origin); |
| 144 | 143 |
| 145 if (!audio_device->SetAudioRenderer(renderer.get())) | 144 if (!audio_device->SetAudioRenderer(renderer.get())) |
| 146 return nullptr; | 145 return nullptr; |
| 147 } | 146 } |
| 148 | 147 |
| 149 return renderer->CreateSharedAudioRendererProxy(web_stream); | 148 return renderer->CreateSharedAudioRendererProxy(web_stream); |
| 150 } | 149 } |
| 151 | 150 |
| 152 } // namespace content | 151 } // namespace content |
| OLD | NEW |