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

Unified Diff: webrtc/audio/audio_receive_stream.cc

Issue 2378143004: Made AudioReceiveStream a mixer participant. (Closed)
Patch Set: Changed 'ssrc' into 'Ssrc' because of change upstream. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/audio/audio_receive_stream.h ('k') | webrtc/audio/webrtc_audio.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/audio/audio_receive_stream.cc
diff --git a/webrtc/audio/audio_receive_stream.cc b/webrtc/audio/audio_receive_stream.cc
index 11a1c5815ecdd7da7f7264f985559d856c8203a5..d05934297cc0c943a779c9be6c1bae0c0014af71 100644
--- a/webrtc/audio/audio_receive_stream.cc
+++ b/webrtc/audio/audio_receive_stream.cc
@@ -272,6 +272,15 @@ bool AudioReceiveStream::DeliverRtp(const uint8_t* packet,
return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time);
}
+AudioMixer::Source::AudioFrameWithInfo
+AudioReceiveStream::GetAudioFrameWithInfo(int sample_rate_hz) {
+ return channel_proxy_->GetAudioFrameWithInfo(sample_rate_hz);
+}
+
+int AudioReceiveStream::Ssrc() {
+ return config_.rtp.local_ssrc;
+}
+
VoiceEngine* AudioReceiveStream::voice_engine() const {
internal::AudioState* audio_state =
static_cast<internal::AudioState*>(audio_state_.get());
« no previous file with comments | « webrtc/audio/audio_receive_stream.h ('k') | webrtc/audio/webrtc_audio.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698