[Cast] RTT clean-up to the max!

media/cast/sender/frame_sender.cc

 // Copyright 2014 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/sender/frame_sender.h"
 
 namespace media {
 namespace cast {
 namespace {
 const int kMinSchedulingDelayMs = 1;
 }  // namespace
 
 FrameSender::FrameSender(scoped_refptr<CastEnvironment> cast_environment,
                          CastTransportSender* const transport_sender,
                          base::TimeDelta rtcp_interval,
                          int rtp_timebase,
                          uint32 ssrc,
                          double max_frame_rate,
                          base::TimeDelta playout_delay)
     : cast_environment_(cast_environment),
       transport_sender_(transport_sender),
       ssrc_(ssrc),
-      rtt_available_(false),
       rtcp_interval_(rtcp_interval),
       max_frame_rate_(max_frame_rate),
       num_aggressive_rtcp_reports_sent_(0),
       last_sent_frame_id_(0),
       latest_acked_frame_id_(0),
       duplicate_ack_counter_(0),
       rtp_timebase_(rtp_timebase),
       weak_factory_(this) {
   DCHECK_GT(rtp_timebase_, 0);
   SetTargetPlayoutDelay(playout_delay);
@@ skipping 37 matching lines @@
   const int64 rtp_delta = TimeDeltaToRtpDelta(time_delta, rtp_timebase_);
   const uint32 now_as_rtp_timestamp =
       GetRecordedRtpTimestamp(last_sent_frame_id_) +
           static_cast<uint32>(rtp_delta);
   transport_sender_->SendSenderReport(ssrc_, now, now_as_rtp_timestamp);
 
   if (schedule_future_reports)
     ScheduleNextRtcpReport();
 }
 
-void FrameSender::OnReceivedRtt(base::TimeDelta rtt,
-                                base::TimeDelta avg_rtt,
-                                base::TimeDelta min_rtt,
-                                base::TimeDelta max_rtt) {
-  rtt_available_ = true;
-  rtt_ = rtt;
-  avg_rtt_ = avg_rtt;
-  min_rtt_ = min_rtt;
-  max_rtt_ = max_rtt;
+void FrameSender::OnMeasuredRoundTripTime(base::TimeDelta rtt) {
+  DCHECK(rtt > base::TimeDelta());
+  current_round_trip_time_ = rtt;
 }
 
 void FrameSender::SetTargetPlayoutDelay(
     base::TimeDelta new_target_playout_delay) {
   target_playout_delay_ = new_target_playout_delay;
   max_unacked_frames_ =
       std::min(kMaxUnackedFrames,
                1 + static_cast<int>(target_playout_delay_ *
                                     max_frame_rate_ /
                                     base::TimeDelta::FromSeconds(1)));
@@ skipping 53 matching lines @@
 base::TimeTicks FrameSender::GetRecordedReferenceTime(uint32 frame_id) const {
   return frame_reference_times_[frame_id % arraysize(frame_reference_times_)];
 }
 
 RtpTimestamp FrameSender::GetRecordedRtpTimestamp(uint32 frame_id) const {
   return frame_rtp_timestamps_[frame_id % arraysize(frame_rtp_timestamps_)];
 }
 
 }  // namespace cast
 }  // namespace media