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

Side by Side Diff: webrtc/audio/audio_receive_stream.cc

Issue 2809613002: Revert of Implemented the GetSources() in native code. (Closed)
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
« no previous file with comments | « webrtc/audio/audio_receive_stream.h ('k') | webrtc/call/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 void AudioReceiveStream::SetSink(std::unique_ptr<AudioSinkInterface> sink) { 212 void AudioReceiveStream::SetSink(std::unique_ptr<AudioSinkInterface> sink) {
213 RTC_DCHECK_RUN_ON(&worker_thread_checker_); 213 RTC_DCHECK_RUN_ON(&worker_thread_checker_);
214 channel_proxy_->SetSink(std::move(sink)); 214 channel_proxy_->SetSink(std::move(sink));
215 } 215 }
216 216
217 void AudioReceiveStream::SetGain(float gain) { 217 void AudioReceiveStream::SetGain(float gain) {
218 RTC_DCHECK_RUN_ON(&worker_thread_checker_); 218 RTC_DCHECK_RUN_ON(&worker_thread_checker_);
219 channel_proxy_->SetChannelOutputVolumeScaling(gain); 219 channel_proxy_->SetChannelOutputVolumeScaling(gain);
220 } 220 }
221 221
222 std::vector<RtpSource> AudioReceiveStream::GetSources() const {
223 RTC_DCHECK_RUN_ON(&worker_thread_checker_);
224 return channel_proxy_->GetSources();
225 }
226
227 AudioMixer::Source::AudioFrameInfo AudioReceiveStream::GetAudioFrameWithInfo( 222 AudioMixer::Source::AudioFrameInfo AudioReceiveStream::GetAudioFrameWithInfo(
228 int sample_rate_hz, 223 int sample_rate_hz,
229 AudioFrame* audio_frame) { 224 AudioFrame* audio_frame) {
230 return channel_proxy_->GetAudioFrameWithInfo(sample_rate_hz, audio_frame); 225 return channel_proxy_->GetAudioFrameWithInfo(sample_rate_hz, audio_frame);
231 } 226 }
232 227
233 int AudioReceiveStream::Ssrc() const { 228 int AudioReceiveStream::Ssrc() const {
234 return config_.rtp.remote_ssrc; 229 return config_.rtp.remote_ssrc;
235 } 230 }
236 231
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) { 328 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) {
334 ScopedVoEInterface<VoEBase> base(voice_engine()); 329 ScopedVoEInterface<VoEBase> base(voice_engine());
335 if (playout) { 330 if (playout) {
336 return base->StartPlayout(config_.voe_channel_id); 331 return base->StartPlayout(config_.voe_channel_id);
337 } else { 332 } else {
338 return base->StopPlayout(config_.voe_channel_id); 333 return base->StopPlayout(config_.voe_channel_id);
339 } 334 }
340 } 335 }
341 } // namespace internal 336 } // namespace internal
342 } // namespace webrtc 337 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream.h ('k') | webrtc/call/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698