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

Unified Diff: media/cast/audio_sender/audio_sender.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: 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
Index: media/cast/audio_sender/audio_sender.cc
diff --git a/media/cast/audio_sender/audio_sender.cc b/media/cast/audio_sender/audio_sender.cc
index 671236cc649fba2f52a9f992bf8447b0e52a4b0f..39047ed075c1475a074835585eac5aca6755d536 100644
--- a/media/cast/audio_sender/audio_sender.cc
+++ b/media/cast/audio_sender/audio_sender.cc
@@ -53,8 +53,7 @@ class LocalRtpSenderStatistics : public RtpSenderStatistics {
AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
const AudioSenderConfig& audio_config,
PacedPacketSender* const paced_packet_sender)
- : incoming_feedback_ssrc_(audio_config.incoming_feedback_ssrc),
- cast_environment_(cast_environment),
+ : cast_environment_(cast_environment),
rtp_sender_(cast_environment->Clock(), &audio_config, NULL,
paced_packet_sender),
rtcp_feedback_(new LocalRtcpAudioSenderFeedback(this)),
@@ -67,12 +66,10 @@ AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
NULL,
audio_config.rtcp_mode,
base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval),
- true,
audio_config.sender_ssrc,
+ audio_config.incoming_feedback_ssrc,
audio_config.rtcp_c_name),
weak_factory_(this) {
- rtcp_.SetRemoteSSRC(audio_config.incoming_feedback_ssrc);
-
if (!audio_config.use_external_encoder) {
audio_encoder_ = new AudioEncoder(
cast_environment, audio_config,
@@ -129,7 +126,7 @@ void AudioSender::ScheduleNextRtcpReport() {
}
void AudioSender::SendRtcpReport() {
- rtcp_.SendRtcpReport(incoming_feedback_ssrc_);
+ rtcp_.SendRtcpFromRtpSender(NULL); // TODO(pwestin): add logging.
ScheduleNextRtcpReport();
}

Powered by Google App Engine
This is Rietveld 408576698