Cast: Merge common functionality from audio/video sender into frame_sender.

media/cast/sender/video_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.
 
 #ifndef MEDIA_CAST_SENDER_VIDEO_SENDER_H_
 #define MEDIA_CAST_SENDER_VIDEO_SENDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 39 matching lines @@
   // Note: It is not guaranteed that |video_frame| will actually be encoded and
   // sent, if VideoSender detects too many frames in flight.  Therefore, clients
   // should be careful about the rate at which this method is called.
   //
   // Note: It is invalid to call this method if InitializationResult() returns
   // anything but STATUS_VIDEO_INITIALIZED.
   void InsertRawVideoFrame(const scoped_refptr<media::VideoFrame>& video_frame,
                            const base::TimeTicks& capture_time);
 
  protected:
-  // Protected for testability.
-  void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback);
+  virtual void OnAck(uint32 frame_id) OVERRIDE;
 
  private:
-  // 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;
-
-  // Called by the |video_encoder_| with the next EncodeFrame to send.
-  void SendEncodedVideoFrame(int requested_bitrate_before_encode,
-                             scoped_ptr<EncodedFrame> encoded_frame);
-  // If this value is non zero then a fixed value is used for bitrate.
-  // If external video encoder is used then bitrate will be fixed to
-  // (min_bitrate + max_bitrate) / 2.
-  const size_t fixed_bitrate_;
-
   // Encodes media::VideoFrame images into EncodedFrames.  Per configuration,
   // this will point to either the internal software-based encoder or a proxy to
   // a hardware-based encoder.
   scoped_ptr<VideoEncoder> video_encoder_;
 
-  // The number of frames currently being processed in |video_encoder_|.
-  int frames_in_encoder_;
-
-  // 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_;
+  // Remember what we set the bitrate to before, no need to set it again if
+  // we get the same value.
+  uint32 last_bitrate_;
 
   // 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_SENDER_VIDEO_SENDER_H_