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

Unified Diff: media/cast/audio_receiver/audio_receiver.cc

Issue 70713002: Cast: Restructure RTCP interface to better fit our usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing line lost in merge Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/audio_receiver/audio_receiver.h ('k') | media/cast/audio_sender/audio_sender.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a3d49fdee77b2703cfc095bdea17772539ea9651..1fee5dfe8d2b21c2f88b39c2192a4feca1438e09 100644
--- a/media/cast/audio_receiver/audio_receiver.cc
+++ b/media/cast/audio_receiver/audio_receiver.cc
@@ -79,7 +79,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_(),
@@ -113,10 +112,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);
}
AudioReceiver::~AudioReceiver() {}
@@ -290,7 +288,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,
@@ -340,7 +339,8 @@ void AudioReceiver::ScheduleNextRtcpReport() {
void AudioReceiver::SendNextRtcpReport() {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
- rtcp_->SendRtcpReport(incoming_ssrc_);
+ // TODO(pwestin): add logging.
+ rtcp_->SendRtcpFromRtpReceiver(NULL, NULL);
ScheduleNextRtcpReport();
}
« no previous file with comments | « media/cast/audio_receiver/audio_receiver.h ('k') | media/cast/audio_sender/audio_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698