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..30d5abb6cc81fe4fcac53613347d60202f5d8def 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,22 +93,12 @@ 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); |
+ webrtc::VideoCodec* stream_codec); |
bool Initialized() const; |
@@ -116,6 +108,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 |