Remove rtcp_interval from cast_config

As the TODO in cast_config.h bu miu@, remove rtcp_interval, since it is
always be kDefaultRtcpIntervalMs.

BUG=
R=miu@chromium.org

Review URL: https://codereview.chromium.org/1012573002

Cr-Commit-Position: refs/heads/master@{#321523}

media/cast/cast_config.cc

@@ -24,7 +24,6 @@ namespace cast {
 VideoSenderConfig::VideoSenderConfig()
     : ssrc(0),
       receiver_ssrc(0),
-      rtcp_interval(kDefaultRtcpIntervalMs),
       max_playout_delay(
           base::TimeDelta::FromMilliseconds(kDefaultRtpMaxDelayMs)),
       rtp_payload_type(0),
@@ -45,7 +44,6 @@ VideoSenderConfig::~VideoSenderConfig() {}
 AudioSenderConfig::AudioSenderConfig()
     : ssrc(0),
       receiver_ssrc(0),
-      rtcp_interval(kDefaultRtcpIntervalMs),
       max_playout_delay(
           base::TimeDelta::FromMilliseconds(kDefaultRtpMaxDelayMs)),
       rtp_payload_type(0),
@@ -60,7 +58,6 @@ AudioSenderConfig::~AudioSenderConfig() {}
 FrameReceiverConfig::FrameReceiverConfig()
     : receiver_ssrc(0),
       sender_ssrc(0),
-      rtcp_interval(kDefaultRtcpIntervalMs),
       rtp_max_delay_ms(kDefaultRtpMaxDelayMs),
       rtp_payload_type(0),
       rtp_timebase(0),

media/cast/cast_config.h

@@ -35,8 +35,6 @@ struct AudioSenderConfig {
   // The receiver's SSRC identifier.
   uint32 receiver_ssrc;
 
-  int rtcp_interval;
-
   // The total amount of time between a frame's capture/recording on the sender
   // and its playback on the receiver (i.e., shown to a user).  This should be
   // set to a value large enough to give the system sufficient time to encode,
@@ -72,8 +70,6 @@ struct VideoSenderConfig {
   // The receiver's SSRC identifier.
   uint32 receiver_ssrc;
 
-  int rtcp_interval;
-
   // The total amount of time between a frame's capture/recording on the sender
   // and its playback on the receiver (i.e., shown to a user).  This should be
   // set to a value large enough to give the system sufficient time to encode,
@@ -129,10 +125,6 @@ struct FrameReceiverConfig {
   // The sender's SSRC identifier.
   uint32 sender_ssrc;
 
-  // Mean interval (in milliseconds) between RTCP reports.
-  // TODO(miu): Remove this since it's never not kDefaultRtcpIntervalMs.
-  int rtcp_interval;
-
   // The total amount of time between a frame's capture/recording on the sender
   // and its playback on the receiver (i.e., shown to a user).  This is fixed as
   // a value large enough to give the system sufficient time to encode,

media/cast/receiver/frame_receiver.cc

@@ -50,7 +50,6 @@ FrameReceiver::FrameReceiver(
             config.sender_ssrc),
       is_waiting_for_consecutive_frame_(false),
       lip_sync_drift_(ClockDriftSmoother::GetDefaultTimeConstant()),
-      rtcp_interval_(base::TimeDelta::FromMilliseconds(config.rtcp_interval)),
       weak_factory_(this) {
   transport_->AddValidSsrc(config.sender_ssrc);
   DCHECK_GT(config.rtp_max_delay_ms, 0);
@@ -320,16 +319,12 @@ void FrameReceiver::SendNextCastMessage() {
 
 void FrameReceiver::ScheduleNextRtcpReport() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
-  base::TimeDelta time_to_next = rtcp_interval_;
-  time_to_next = std::max(
-      time_to_next, base::TimeDelta::FromMilliseconds(kMinSchedulingDelayMs));
 
   cast_environment_->PostDelayedTask(
-      CastEnvironment::MAIN,
-      FROM_HERE,
+      CastEnvironment::MAIN, FROM_HERE,
       base::Bind(&FrameReceiver::SendNextRtcpReport,
                  weak_factory_.GetWeakPtr()),
-      time_to_next);
+      base::TimeDelta::FromMilliseconds(kDefaultRtcpIntervalMs));
 }
 
 void FrameReceiver::SendNextRtcpReport() {

media/cast/receiver/frame_receiver.h

@@ -178,9 +178,6 @@ class FrameReceiver : public RtpPayloadFeedback,
   base::TimeTicks lip_sync_reference_time_;
   ClockDriftSmoother lip_sync_drift_;
 
-  // Time interval for sending a RTCP report.
-  const base::TimeDelta rtcp_interval_;
-
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FrameReceiver> weak_factory_;
 

media/cast/sender/audio_sender.cc

@@ -21,7 +21,6 @@ AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
     : FrameSender(cast_environment,
                   true,
                   transport_sender,
-                  base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval),
                   audio_config.frequency,
                   audio_config.ssrc,
                   0,  // |max_frame_rate_| is set after encoder initialization.

media/cast/sender/frame_sender.cc

@@ -25,7 +25,6 @@ const int kMaxFrameBurst = 5;
 FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment,
                          bool is_audio,
                          CastTransportSender* const transport_sender,
-                         base::TimeDelta rtcp_interval,
                          int rtp_timebase,
                          uint32 ssrc,
                          double max_frame_rate,
@@ -35,7 +34,6 @@ FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment,
     : cast_environment_(cast_environment),
       transport_sender_(transport_sender),
       ssrc_(ssrc),
-      rtcp_interval_(rtcp_interval),
       min_playout_delay_(min_playout_delay == base::TimeDelta() ?
                          max_playout_delay : min_playout_delay),
       max_playout_delay_(max_playout_delay),
@@ -62,17 +60,12 @@ FrameSender::~FrameSender() {
 
 void FrameSender::ScheduleNextRtcpReport() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
-  base::TimeDelta time_to_next = rtcp_interval_;
-
-  time_to_next = std::max(
-      time_to_next, base::TimeDelta::FromMilliseconds(kMinSchedulingDelayMs));
 
   cast_environment_->PostDelayedTask(
-      CastEnvironment::MAIN,
-      FROM_HERE,
+      CastEnvironment::MAIN, FROM_HERE,
       base::Bind(&FrameSender::SendRtcpReport, weak_factory_.GetWeakPtr(),
                  true),
-      time_to_next);
+      base::TimeDelta::FromMilliseconds(kDefaultRtcpIntervalMs));
 }
 
 void FrameSender::SendRtcpReport(bool schedule_future_reports) {

media/cast/sender/frame_sender.h

@@ -25,7 +25,6 @@ class FrameSender {
   FrameSender(scoped_refptr<CastEnvironment> cast_environment,
               bool is_audio,
               CastTransportSender* const transport_sender,
-              base::TimeDelta rtcp_interval,
               int rtp_timebase,
               uint32 ssrc,
               double max_frame_rate,
@@ -107,8 +106,6 @@ class FrameSender {
   // Returns the number of frames that were sent but not yet acknowledged.
   int GetUnacknowledgedFrameCount() const;
 
-  const base::TimeDelta rtcp_interval_;
-
   // The total amount of time between a frame's capture/recording on the sender
   // and its playback on the receiver (i.e., shown to a user).  This is fixed as
   // a value large enough to give the system sufficient time to encode,

media/cast/sender/video_sender.cc

@@ -69,22 +69,21 @@ VideoSender::VideoSender(
     CastTransportSender* const transport_sender,
     const PlayoutDelayChangeCB& playout_delay_change_cb)
     : FrameSender(
-        cast_environment,
-        false,
-        transport_sender,
-        base::TimeDelta::FromMilliseconds(video_config.rtcp_interval),
-        kVideoFrequency,
-        video_config.ssrc,
-        video_config.max_frame_rate,
-        video_config.min_playout_delay,
-        video_config.max_playout_delay,
-        video_config.use_external_encoder ?
-            NewFixedCongestionControl(
-                (video_config.min_bitrate + video_config.max_bitrate) / 2) :
-            NewAdaptiveCongestionControl(cast_environment->Clock(),
-                                         video_config.max_bitrate,
-                                         video_config.min_bitrate,
-                                         video_config.max_frame_rate)),
+          cast_environment,
+          false,
+          transport_sender,
+          kVideoFrequency,
+          video_config.ssrc,
+          video_config.max_frame_rate,
+          video_config.min_playout_delay,
+          video_config.max_playout_delay,
+          video_config.use_external_encoder
+              ? NewFixedCongestionControl(
+                    (video_config.min_bitrate + video_config.max_bitrate) / 2)
+              : NewAdaptiveCongestionControl(cast_environment->Clock(),
+                                             video_config.max_bitrate,
+                                             video_config.min_bitrate,
+                                             video_config.max_frame_rate)),
       frames_in_encoder_(0),
       last_bitrate_(0),
       playout_delay_change_cb_(playout_delay_change_cb),