[Cast] Track audio queued in encoder; account for it in ShouldDropNextFrame().

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 28 matching lines @@
 
   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;
+
+  // 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);
 
   const scoped_refptr<CastEnvironment> cast_environment_;
 
   // Sends encoded frames over the configured transport (e.g., UDP).  In
   // Chromium, this could be a proxy that first sends the frames from a renderer
@@ skipping 26 matching lines @@
   // 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;
 
-  // Called when we get an ACK for a frame.
-  virtual void OnAck(uint32 frame_id) = 0;
-
   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_;
 
   // If true, we transmit the target playout delay to the receiver.
   bool send_target_playout_delay_;
 
   // Max encoded frames generated per second.
   double max_frame_rate_;
 
   // Maximum number of outstanding frames before the encoding and sending of
   // new frames shall halt.
   int max_unacked_frames_;
 
-  // The number of frames currently being processed in |video_encoder_|.
-  int frames_in_encoder_;
-
   // Counts how many RTCP reports are being "aggressively" sent (i.e., one per
   // frame) at the start of the session.  Once a threshold is reached, RTCP
   // reports are instead sent at the configured interval + random drift.
   int num_aggressive_rtcp_reports_sent_;
 
   // This is "null" until the first frame is sent.  Thereafter, this tracks the
   // last time any frame was sent or re-sent.
   base::TimeTicks last_send_time_;
 
   // The ID of the last frame sent.  Logic throughout FrameSender assumes this
@@ skipping 38 matching lines @@
   // 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_