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

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

Issue 2378143004: Made AudioReceiveStream a mixer participant. (Closed)
Patch Set: Created 4 years, 2 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 /* 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 if (packet_time.timestamp >= 0) 264 if (packet_time.timestamp >= 0)
265 arrival_time_ms = (packet_time.timestamp + 500) / 1000; 265 arrival_time_ms = (packet_time.timestamp + 500) / 1000;
266 size_t payload_size = length - header.headerLength; 266 size_t payload_size = length - header.headerLength;
267 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_size, 267 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_size,
268 header); 268 header);
269 } 269 }
270 270
271 return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time); 271 return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time);
272 } 272 }
273 273
274 MixerAudioSource::AudioFrameWithMuted
275 AudioReceiveStream::GetAudioFrameWithMuted(int32_t id, int sample_rate_hz) {
276 return channel_proxy_->GetAudioFrameWithMuted(id, sample_rate_hz);
277 }
278
274 VoiceEngine* AudioReceiveStream::voice_engine() const { 279 VoiceEngine* AudioReceiveStream::voice_engine() const {
275 internal::AudioState* audio_state = 280 internal::AudioState* audio_state =
276 static_cast<internal::AudioState*>(audio_state_.get()); 281 static_cast<internal::AudioState*>(audio_state_.get());
277 VoiceEngine* voice_engine = audio_state->voice_engine(); 282 VoiceEngine* voice_engine = audio_state->voice_engine();
278 RTC_DCHECK(voice_engine); 283 RTC_DCHECK(voice_engine);
279 return voice_engine; 284 return voice_engine;
280 } 285 }
281 } // namespace internal 286 } // namespace internal
282 } // namespace webrtc 287 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698