Extract simulcast rate allocation outside of video encoder.

webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
index be6aa59b6c6651a67c4193be40ba798a3ef86190..6b7fedf6ced3973409f42abdbb1f15f9cf81c983 100644
--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
@@ -20,6 +20,8 @@
 
 namespace webrtc {
 
+class SimulcastRateAllocator;
+
 class VideoEncoderFactory {
  public:
   virtual VideoEncoder* Create() = 0;
@@ -91,19 +93,10 @@ class SimulcastEncoderAdapter : public VP8Encoder {
     bool send_stream;
   };
 
-  // Get the stream bitrate, for the stream |stream_idx|, given the bitrate
-  // |new_bitrate_kbit| and the actual configured stream count in
-  // |total_number_of_streams|. The function also returns whether there's enough
-  // bandwidth to send this stream via |send_stream|.
-  uint32_t GetStreamBitrate(int stream_idx,
-                            size_t total_number_of_streams,
-                            uint32_t new_bitrate_kbit,
-                            bool* send_stream) const;
-
   // Populate the codec settings for each stream.
   void PopulateStreamCodec(const webrtc::VideoCodec* inst,
                            int stream_index,
-                           size_t total_number_of_streams,
+                           uint32_t start_bitrate_kbps,
                            bool highest_resolution_stream,
                            webrtc::VideoCodec* stream_codec,
                            bool* send_stream);
@@ -116,6 +109,7 @@ class SimulcastEncoderAdapter : public VP8Encoder {
   std::vector<StreamInfo> streaminfos_;
   EncodedImageCallback* encoded_complete_callback_;
   std::string implementation_name_;
+  std::unique_ptr<SimulcastRateAllocator> rate_allocator_;
 };
 
 }  // namespace webrtc