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

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

Issue 2799563002: Replace usage of WebVector::isEmpty with WebVector::empty().
Patch Set: Created 3 years, 8 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 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 65 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
66 const scoped_refptr<base::TaskRunner>& worker_task_runner, 66 const scoped_refptr<base::TaskRunner>& worker_task_runner,
67 media::GpuVideoAcceleratorFactories* gpu_factories) { 67 media::GpuVideoAcceleratorFactories* gpu_factories) {
68 DCHECK(!web_stream.isNull()); 68 DCHECK(!web_stream.isNull());
69 69
70 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:" 70 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:"
71 << web_stream.id().utf8(); 71 << web_stream.id().utf8();
72 72
73 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; 73 blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
74 web_stream.videoTracks(video_tracks); 74 web_stream.videoTracks(video_tracks);
75 if (video_tracks.isEmpty() || 75 if (video_tracks.empty() ||
76 !MediaStreamVideoTrack::GetTrack(video_tracks[0])) { 76 !MediaStreamVideoTrack::GetTrack(video_tracks[0])) {
77 return NULL; 77 return NULL;
78 } 78 }
79 79
80 return new MediaStreamVideoRendererSink(video_tracks[0], error_cb, repaint_cb, 80 return new MediaStreamVideoRendererSink(video_tracks[0], error_cb, repaint_cb,
81 io_task_runner, media_task_runner, 81 io_task_runner, media_task_runner,
82 worker_task_runner, gpu_factories); 82 worker_task_runner, gpu_factories);
83 } 83 }
84 84
85 scoped_refptr<MediaStreamAudioRenderer> 85 scoped_refptr<MediaStreamAudioRenderer>
86 MediaStreamRendererFactoryImpl::GetAudioRenderer( 86 MediaStreamRendererFactoryImpl::GetAudioRenderer(
87 const blink::WebMediaStream& web_stream, 87 const blink::WebMediaStream& web_stream,
88 int render_frame_id, 88 int render_frame_id,
89 const std::string& device_id, 89 const std::string& device_id,
90 const url::Origin& security_origin) { 90 const url::Origin& security_origin) {
91 DCHECK(!web_stream.isNull()); 91 DCHECK(!web_stream.isNull());
92 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; 92 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
93 web_stream.audioTracks(audio_tracks); 93 web_stream.audioTracks(audio_tracks);
94 if (audio_tracks.isEmpty()) 94 if (audio_tracks.empty())
95 return NULL; 95 return NULL;
96 96
97 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:" 97 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:"
98 << web_stream.id().utf8(); 98 << web_stream.id().utf8();
99 99
100 // TODO(tommi): We need to fix the data flow so that 100 // TODO(tommi): We need to fix the data flow so that
101 // it works the same way for all track implementations, local, remote or what 101 // it works the same way for all track implementations, local, remote or what
102 // have you. 102 // have you.
103 // In this function, we should simply create a renderer object that receives 103 // In this function, we should simply create a renderer object that receives
104 // and mixes audio from all the tracks that belong to the media stream. 104 // and mixes audio from all the tracks that belong to the media stream.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 device_id, security_origin); 143 device_id, security_origin);
144 144
145 if (!audio_device->SetAudioRenderer(renderer.get())) 145 if (!audio_device->SetAudioRenderer(renderer.get()))
146 return nullptr; 146 return nullptr;
147 } 147 }
148 148
149 return renderer->CreateSharedAudioRendererProxy(web_stream); 149 return renderer->CreateSharedAudioRendererProxy(web_stream);
150 } 150 }
151 151
152 } // namespace content 152 } // namespace content
OLDNEW
« no previous file with comments | « content/child/webmessageportchannel_impl.cc ('k') | content/renderer/media/peer_connection_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698