Adapt encoder behavior to target bitrate

remoting/protocol/webrtc_video_encoder_factory.h

Index: remoting/protocol/webrtc_video_encoder_factory.h
diff --git a/remoting/protocol/webrtc_video_encoder.h b/remoting/protocol/webrtc_video_encoder_factory.h
similarity index 84%
rename from remoting/protocol/webrtc_video_encoder.h
rename to remoting/protocol/webrtc_video_encoder_factory.h
index 0a32957d2de200171166e4c0ddf4d5214d7def8a..6888a6b86d8c31ca076b316ff0ded86eb1b27e4c 100644
--- a/remoting/protocol/webrtc_video_encoder.h
+++ b/remoting/protocol/webrtc_video_encoder_factory.h
@@ -16,6 +16,8 @@
 
 namespace remoting {
 
+using TargetBitrateCallback = base::Callback<void(uint32_t)>;

[Sergey Ulanov, 2016/05/10 00:00:58]

s/uint32_t/int bitrate_kbps/

[Irfan, 2016/05/10 16:30:45]

Done.

+
 // This is the interface between the WebRtc engine and the external encoder
 // provided by remoting. WebRtc provides feedback on network bandwidth, latency
 // & RTT and in turn remoting passes encoded frames as they get encoded
@@ -39,19 +41,20 @@ class WebRtcVideoEncoder : public webrtc::VideoEncoder {
   int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
   int32_t SetRates(uint32_t bitrate, uint32_t framerate) override;
 
-  int SendEncodedFrame(int64_t capture_timestamp_ms,
-                       std::unique_ptr<VideoPacket> pkt);
+  int SendEncodedFrame(std::unique_ptr<VideoPacket> pkt);
   void SetKeyFrameRequestCallback(const base::Closure& key_frame_request);
+  void SetTargetBitrateCallback(const TargetBitrateCallback& target_bitrate_cb);
 
  private:
-  // Protects |encoded_callback_|, |key_frame_request_| and |state_|.
+  // Protects |encoded_callback_|, |key_frame_request_|,
+  // |target_bitrate_cb_| and |state_|.
   base::Lock lock_;
   State state_;
   webrtc::EncodedImageCallback* encoded_callback_;
 
   base::Closure key_frame_request_;
+  TargetBitrateCallback target_bitrate_cb_;
   webrtc::VideoCodecType video_codec_type_;
-  uint32_t target_bitrate_;
 };
 
 // This is the external encoder factory implementation that is passed to
@@ -71,15 +74,16 @@ class WebRtcVideoEncoderFactory : public cricket::WebRtcVideoEncoderFactory {
   bool EncoderTypeHasInternalSource(webrtc::VideoCodecType type) const override;
   void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
 
-  int SendEncodedFrame(int64_t capture_timestamp_ms,
-                       std::unique_ptr<VideoPacket> pkt);
+  int SendEncodedFrame(std::unique_ptr<VideoPacket> pkt);
 
   void SetKeyFrameRequestCallback(const base::Closure& key_frame_request);
+  void SetTargetBitrateCallback(const TargetBitrateCallback& target_bitrate_cb);
 
  private:
-  // Protects |key_frame_request_|.
+  // Protects |key_frame_request_| and |target_bitrate_cb_|.
   base::Lock lock_;
   base::Closure key_frame_request_;
+  TargetBitrateCallback target_bitrate_cb_;
   std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec> codecs_;
   std::vector<std::unique_ptr<WebRtcVideoEncoder>> encoders_;
 };