Cast: Restructure RTCP interface to better fit our usage.

media/cast/audio_sender/audio_sender.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/audio_sender/audio_sender.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "media/cast/audio_sender/audio_encoder.h"
@@ skipping 35 matching lines @@
     rtp_sender_->RtpStatistics(now, sender_info);
   }
 
  private:
   RtpSender* rtp_sender_;
 };
 
 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)),
         rtp_audio_sender_statistics_(
             new LocalRtpSenderStatistics(&rtp_sender_)),
         rtcp_(cast_environment->Clock(),
               rtcp_feedback_.get(),
               paced_packet_sender,
               rtp_audio_sender_statistics_.get(),
               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),
         initialized_(false),
         weak_factory_(this) {
-  rtcp_.SetRemoteSSRC(audio_config.incoming_feedback_ssrc);
-
   if (!audio_config.use_external_encoder) {
     audio_encoder_ = new AudioEncoder(
         cast_environment, audio_config,
         base::Bind(&AudioSender::SendEncodedAudioFrame,
                    weak_factory_.GetWeakPtr()));
   }
 }
 
 AudioSender::~AudioSender() {}
 
@@ skipping 51 matching lines @@
   time_to_next = std::max(time_to_next,
       base::TimeDelta::FromMilliseconds(kMinSchedulingDelayMs));
 
   cast_environment_->PostDelayedTask(CastEnvironment::MAIN, FROM_HERE,
       base::Bind(&AudioSender::SendRtcpReport, weak_factory_.GetWeakPtr()),
                  time_to_next);
 }
 
 void AudioSender::SendRtcpReport() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
-  rtcp_.SendRtcpReport(incoming_feedback_ssrc_);
+  rtcp_.SendRtcpFromRtpSender(NULL);  // TODO(pwestin): add logging.
   ScheduleNextRtcpReport();
 }
 
 }  // namespace cast
 }  // namespace media