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

Side by Side Diff: content/renderer/media/webrtc/webrtc_audio_sink.cc

Issue 2873333004: Rename TaskRunner::RunsTasksOnCurrentThread() in //content (Closed)
Patch Set: Created 3 years, 7 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/webrtc/webrtc_audio_sink.h" 5 #include "content/renderer/media/webrtc/webrtc_audio_sink.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 number_of_channels, number_of_frames); 132 number_of_channels, number_of_frames);
133 } 133 }
134 } 134 }
135 135
136 std::string WebRtcAudioSink::Adapter::kind() const { 136 std::string WebRtcAudioSink::Adapter::kind() const {
137 return webrtc::MediaStreamTrackInterface::kAudioKind; 137 return webrtc::MediaStreamTrackInterface::kAudioKind;
138 } 138 }
139 139
140 bool WebRtcAudioSink::Adapter::set_enabled(bool enable) { 140 bool WebRtcAudioSink::Adapter::set_enabled(bool enable) {
141 DCHECK(!signaling_task_runner_ || 141 DCHECK(!signaling_task_runner_ ||
142 signaling_task_runner_->RunsTasksOnCurrentThread()); 142 signaling_task_runner_->RunsTasksInCurrentSequence());
143 return webrtc::MediaStreamTrack<webrtc::AudioTrackInterface>:: 143 return webrtc::MediaStreamTrack<webrtc::AudioTrackInterface>::
144 set_enabled(enable); 144 set_enabled(enable);
145 } 145 }
146 146
147 void WebRtcAudioSink::Adapter::AddSink(webrtc::AudioTrackSinkInterface* sink) { 147 void WebRtcAudioSink::Adapter::AddSink(webrtc::AudioTrackSinkInterface* sink) {
148 DCHECK(!signaling_task_runner_ || 148 DCHECK(!signaling_task_runner_ ||
149 signaling_task_runner_->RunsTasksOnCurrentThread()); 149 signaling_task_runner_->RunsTasksInCurrentSequence());
150 DCHECK(sink); 150 DCHECK(sink);
151 base::AutoLock auto_lock(lock_); 151 base::AutoLock auto_lock(lock_);
152 DCHECK(std::find(sinks_.begin(), sinks_.end(), sink) == sinks_.end()); 152 DCHECK(std::find(sinks_.begin(), sinks_.end(), sink) == sinks_.end());
153 sinks_.push_back(sink); 153 sinks_.push_back(sink);
154 } 154 }
155 155
156 void WebRtcAudioSink::Adapter::RemoveSink( 156 void WebRtcAudioSink::Adapter::RemoveSink(
157 webrtc::AudioTrackSinkInterface* sink) { 157 webrtc::AudioTrackSinkInterface* sink) {
158 DCHECK(!signaling_task_runner_ || 158 DCHECK(!signaling_task_runner_ ||
159 signaling_task_runner_->RunsTasksOnCurrentThread()); 159 signaling_task_runner_->RunsTasksInCurrentSequence());
160 base::AutoLock auto_lock(lock_); 160 base::AutoLock auto_lock(lock_);
161 const auto it = std::find(sinks_.begin(), sinks_.end(), sink); 161 const auto it = std::find(sinks_.begin(), sinks_.end(), sink);
162 if (it != sinks_.end()) 162 if (it != sinks_.end())
163 sinks_.erase(it); 163 sinks_.erase(it);
164 } 164 }
165 165
166 bool WebRtcAudioSink::Adapter::GetSignalLevel(int* level) { 166 bool WebRtcAudioSink::Adapter::GetSignalLevel(int* level) {
167 DCHECK(!signaling_task_runner_ || 167 DCHECK(!signaling_task_runner_ ||
168 signaling_task_runner_->RunsTasksOnCurrentThread()); 168 signaling_task_runner_->RunsTasksInCurrentSequence());
169 169
170 // |level_| is only set once, so it's safe to read without first acquiring a 170 // |level_| is only set once, so it's safe to read without first acquiring a
171 // mutex. 171 // mutex.
172 if (!level_) 172 if (!level_)
173 return false; 173 return false;
174 const float signal_level = level_->GetCurrent(); 174 const float signal_level = level_->GetCurrent();
175 DCHECK_GE(signal_level, 0.0f); 175 DCHECK_GE(signal_level, 0.0f);
176 DCHECK_LE(signal_level, 1.0f); 176 DCHECK_LE(signal_level, 1.0f);
177 // Convert from float in range [0.0,1.0] to an int in range [0,32767]. 177 // Convert from float in range [0.0,1.0] to an int in range [0,32767].
178 *level = static_cast<int>(signal_level * std::numeric_limits<int16_t>::max() + 178 *level = static_cast<int>(signal_level * std::numeric_limits<int16_t>::max() +
179 0.5f /* rounding to nearest int */); 179 0.5f /* rounding to nearest int */);
180 return true; 180 return true;
181 } 181 }
182 182
183 rtc::scoped_refptr<webrtc::AudioProcessorInterface> 183 rtc::scoped_refptr<webrtc::AudioProcessorInterface>
184 WebRtcAudioSink::Adapter::GetAudioProcessor() { 184 WebRtcAudioSink::Adapter::GetAudioProcessor() {
185 DCHECK(!signaling_task_runner_ || 185 DCHECK(!signaling_task_runner_ ||
186 signaling_task_runner_->RunsTasksOnCurrentThread()); 186 signaling_task_runner_->RunsTasksInCurrentSequence());
187 return audio_processor_.get(); 187 return audio_processor_.get();
188 } 188 }
189 189
190 webrtc::AudioSourceInterface* WebRtcAudioSink::Adapter::GetSource() const { 190 webrtc::AudioSourceInterface* WebRtcAudioSink::Adapter::GetSource() const {
191 DCHECK(!signaling_task_runner_ || 191 DCHECK(!signaling_task_runner_ ||
192 signaling_task_runner_->RunsTasksOnCurrentThread()); 192 signaling_task_runner_->RunsTasksInCurrentSequence());
193 return source_.get(); 193 return source_.get();
194 } 194 }
195 195
196 } // namespace content 196 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_source.cc ('k') | content/renderer/service_worker/service_worker_context_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698