Cast: Updated congestion control

media/cast/video_sender/video_sender.h

 // 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.
 
 #ifndef MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_
 #define MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 79 matching lines @@
   // Returns true if there are too many frames in flight, as defined by the
   // configured target playout delay plus simple logic.  When this is true,
   // InsertRawVideoFrame() will silenty drop frames instead of sending them to
   // the video encoder.
   bool AreTooManyFramesInFlight() const;
 
   // Called by the |video_encoder_| with the next EncodeFrame to send.
   void SendEncodedVideoFrame(int requested_bitrate_before_encode,
                              scoped_ptr<transport::EncodedFrame> encoded_frame);
 
-  void UpdateBitrate(int32 new_bitrate);
-
   const scoped_refptr<CastEnvironment> cast_environment_;
 
   // 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.).
   const base::TimeDelta target_playout_delay_;
 
@@ skipping 42 matching lines @@
   // acknowledged.  Logic throughout VideoSender assumes this can safely
   // wrap-around.  This member is invalid until |!last_send_time_.is_null()|.
   uint32 latest_acked_frame_id_;
 
   // 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_;
 
-  // Desired encoder bitrate (in bits per second).  This is updated by querying
-  // |congestion_control_| as each ACK is received.
-  int current_requested_bitrate_;
-
   // When we get close to the max number of un-acked frames, we set lower
   // the bitrate drastically to ensure that we catch up. Without this we
   // risk getting stuck in a catch-up state forever.
   CongestionControl congestion_control_;
 
   // If this sender is ready for use, this is STATUS_VIDEO_INITIALIZED.
   CastInitializationStatus cast_initialization_status_;
 
   // This is a "good enough" mapping for finding the RTP timestamp associated
   // with a video frame. The key is the lowest 8 bits of frame id (which is
   // what is sent via RTCP). This map is used for logging purposes. The only
   // time when this mapping will be incorrect is when it receives an ACK for a
   // old enough frame such that 8-bit wrap around has already occurred, which
   // should be pretty rare.
   RtpTimestamp frame_id_to_rtp_timestamp_[256];
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoSender);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_