| Index: media/cast/audio_receiver/audio_receiver.cc
|
| diff --git a/media/cast/audio_receiver/audio_receiver.cc b/media/cast/audio_receiver/audio_receiver.cc
|
| index c3dc3937b9acf176364fcc8aa5dbe3a16461da3a..912da97f26b3339a396029da108b596e3e170913 100644
|
| --- a/media/cast/audio_receiver/audio_receiver.cc
|
| +++ b/media/cast/audio_receiver/audio_receiver.cc
|
| @@ -80,7 +80,6 @@ AudioReceiver::AudioReceiver(scoped_refptr<CastEnvironment> cast_environment,
|
| PacedPacketSender* const packet_sender)
|
| : cast_environment_(cast_environment),
|
| codec_(audio_config.codec),
|
| - incoming_ssrc_(audio_config.incoming_ssrc),
|
| frequency_(audio_config.frequency),
|
| audio_buffer_(),
|
| audio_decoder_(),
|
| @@ -114,10 +113,9 @@ AudioReceiver::AudioReceiver(scoped_refptr<CastEnvironment> cast_environment,
|
| rtp_audio_receiver_statistics_.get(),
|
| audio_config.rtcp_mode,
|
| rtcp_interval_delta,
|
| - false,
|
| audio_config.feedback_ssrc,
|
| + audio_config.incoming_ssrc,
|
| audio_config.rtcp_c_name));
|
| - rtcp_->SetRemoteSSRC(audio_config.incoming_ssrc);
|
| ScheduleNextRtcpReport();
|
| ScheduleNextCastMessage();
|
| }
|
| @@ -280,7 +278,8 @@ void AudioReceiver::IncomingPacket(const uint8* packet, size_t length,
|
| }
|
|
|
| void AudioReceiver::CastFeedback(const RtcpCastMessage& cast_message) {
|
| - rtcp_->SendRtcpCast(cast_message);
|
| + // TODO(pwestin): add logging.
|
| + rtcp_->SendRtcpFromRtpReceiver(&cast_message, NULL);
|
| }
|
|
|
| base::TimeTicks AudioReceiver::GetPlayoutTime(base::TimeTicks now,
|
| @@ -327,7 +326,8 @@ void AudioReceiver::ScheduleNextRtcpReport() {
|
| }
|
|
|
| void AudioReceiver::SendNextRtcpReport() {
|
| - rtcp_->SendRtcpReport(incoming_ssrc_);
|
| + // TODO(pwestin): add logging.
|
| + rtcp_->SendRtcpFromRtpReceiver(NULL, NULL);
|
| ScheduleNextRtcpReport();
|
| }
|
|
|
|
|