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

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

Issue 2448113009: Add a NeededFrequency() method to the AudioMixer::Source interface. (Closed)
Patch Set: Changed name to PreferredSampleRate and made Ssrc const. Created 4 years, 1 month 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 /* 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 271
272 return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time); 272 return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time);
273 } 273 }
274 274
275 AudioMixer::Source::AudioFrameInfo AudioReceiveStream::GetAudioFrameWithInfo( 275 AudioMixer::Source::AudioFrameInfo AudioReceiveStream::GetAudioFrameWithInfo(
276 int sample_rate_hz, 276 int sample_rate_hz,
277 AudioFrame* audio_frame) { 277 AudioFrame* audio_frame) {
278 return channel_proxy_->GetAudioFrameWithInfo(sample_rate_hz, audio_frame); 278 return channel_proxy_->GetAudioFrameWithInfo(sample_rate_hz, audio_frame);
279 } 279 }
280 280
281 int AudioReceiveStream::Ssrc() { 281 int AudioReceiveStream::PreferredSampleRate() const {
282 return channel_proxy_->NeededFrequency();
283 }
284
285 int AudioReceiveStream::Ssrc() const {
282 return config_.rtp.local_ssrc; 286 return config_.rtp.local_ssrc;
283 } 287 }
284 288
285 VoiceEngine* AudioReceiveStream::voice_engine() const { 289 VoiceEngine* AudioReceiveStream::voice_engine() const {
286 internal::AudioState* audio_state = 290 internal::AudioState* audio_state =
287 static_cast<internal::AudioState*>(audio_state_.get()); 291 static_cast<internal::AudioState*>(audio_state_.get());
288 VoiceEngine* voice_engine = audio_state->voice_engine(); 292 VoiceEngine* voice_engine = audio_state->voice_engine();
289 RTC_DCHECK(voice_engine); 293 RTC_DCHECK(voice_engine);
290 return voice_engine; 294 return voice_engine;
291 } 295 }
292 } // namespace internal 296 } // namespace internal
293 } // namespace webrtc 297 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream.h ('k') | webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698