[Cast] Limit frames in flight by duration, and not by number of frames.

media/cast/sender/frame_sender.h

 // 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.
 //
 // This is the base class for an object that send frames to a receiver.
 // TODO(hclam): Refactor such that there is no separate AudioSender vs.
 // VideoSender, and the functionality of both is rolled into this class.
 
 #ifndef MEDIA_CAST_SENDER_FRAME_SENDER_H_
 #define MEDIA_CAST_SENDER_FRAME_SENDER_H_
@@ skipping 16 matching lines @@
               CastTransportSender* const transport_sender,
               base::TimeDelta rtcp_interval,
               int rtp_timebase,
               uint32 ssrc,
               double max_frame_rate,
               base::TimeDelta min_playout_delay,
               base::TimeDelta max_playout_delay,
               CongestionControl* congestion_control);
   virtual ~FrameSender();
 
+  int rtp_timebase() const { return rtp_timebase_; }
+
   // Calling this function is only valid if the receiver supports the
   // "extra_playout_delay", rtp extension.
   void SetTargetPlayoutDelay(base::TimeDelta new_target_playout_delay);
 
   base::TimeDelta GetTargetPlayoutDelay() const {
     return target_playout_delay_;
   }
 
   // Called by the encoder with the next EncodeFrame to send.
   void SendEncodedFrame(int requested_bitrate_before_encode,
                         scoped_ptr<EncodedFrame> encoded_frame);
 
  protected:
   // Returns the number of frames in the encoder's backlog.
   virtual int GetNumberOfFramesInEncoder() const = 0;
 
+  // Returns the duration of the data in the encoder's backlog plus the duration
+  // of sent, unacknowledged frames.
+  virtual base::TimeDelta GetInFlightMediaDuration() const = 0;
+
   // Called when we get an ACK for a frame.
   virtual void OnAck(uint32 frame_id) = 0;
 
  protected:
   // Schedule and execute periodic sending of RTCP report.
   void ScheduleNextRtcpReport();
   void SendRtcpReport(bool schedule_future_reports);
 
   void OnMeasuredRoundTripTime(base::TimeDelta rtt);
 
@@ skipping 14 matching lines @@
   // speculatively re-send certain packets of an unacked frame to kick-start
   // re-transmission.  This is a last resort tactic to prevent the session from
   // getting stuck after a long outage.
   void ScheduleNextResendCheck();
   void ResendCheck();
   void ResendForKickstart();
 
   // Protected for testability.
   void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback);
 
-  // Returns true if there are too many frames in flight, or if the media
-  // duration of the frames in flight would be too high by sending the next
-  // frame.  The latter metric is determined from the given |capture_time|
-  // for the next frame to be encoded and sent.
-  bool ShouldDropNextFrame(base::TimeTicks capture_time) const;
+  // Returns true if too many frames would be in-flight by encoding and sending
+  // the next frame having the given |frame_duration|.
+  bool ShouldDropNextFrame(base::TimeDelta frame_duration) const;
 
   // Record or retrieve a recent history of each frame's timestamps.
   // Warning: If a frame ID too far in the past is requested, the getters will
   // silently succeed but return incorrect values.  Be sure to respect
   // media::cast::kMaxUnackedFrames.
   void RecordLatestFrameTimestamps(uint32 frame_id,
                                    base::TimeTicks reference_time,
                                    RtpTimestamp rtp_timestamp);
   base::TimeTicks GetRecordedReferenceTime(uint32 frame_id) const;
   RtpTimestamp GetRecordedRtpTimestamp(uint32 frame_id) const;
 
+  // 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,
   // transmit/retransmit, receive, decode, and render; given its run-time
   // environment (sender/receiver hardware performance, network conditions,
   // etc.).
   base::TimeDelta target_playout_delay_;
   base::TimeDelta min_playout_delay_;
@@ skipping 31 matching lines @@
   // Counts the number of duplicate ACK that are being received.  When this
   // number reaches a threshold, the sender will take this as a sign that the
   // receiver hasn't yet received the first packet of the next frame.  In this
   // case, VideoSender will trigger a re-send of the next frame.
   int duplicate_ack_counter_;
 
   // If this sender is ready for use, this is STATUS_AUDIO_INITIALIZED or
   // STATUS_VIDEO_INITIALIZED.
   CastInitializationStatus cast_initialization_status_;
 
-  // RTP timestamp increment representing one second.
-  const int rtp_timebase_;
-
   // This object controls how we change the bitrate to make sure the
   // buffer doesn't overflow.
   scoped_ptr<CongestionControl> congestion_control_;
 
   // The most recently measured round trip time.
   base::TimeDelta current_round_trip_time_;
 
  private:
+  // Returns the maximum media duration currently allowed in-flight.  This
+  // fluctuates in response to the currently-measured network latency.
+  base::TimeDelta GetAllowedInFlightMediaDuration() const;
+
+  // RTP timestamp increment representing one second.
+  const int rtp_timebase_;
+
   const bool is_audio_;
 
   // Ring buffers to keep track of recent frame timestamps (both in terms of
   // local reference time and RTP media time).  These should only be accessed
   // through the Record/GetXXX() methods.
   base::TimeTicks frame_reference_times_[256];
   RtpTimestamp frame_rtp_timestamps_[256];
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FrameSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameSender);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_SENDER_FRAME_SENDER_H_