| Index: webrtc/video/video_send_stream.h
|
| diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
|
| index 64b7fceaf358eed00b815bdfc870bbf513fec420..23c73ca33fefb5c4ae722ff635fc3cc8bc4a12e4 100644
|
| --- a/webrtc/video/video_send_stream.h
|
| +++ b/webrtc/video/video_send_stream.h
|
| @@ -59,7 +59,7 @@ class VideoSendStream : public webrtc::VideoSendStream,
|
|
|
| // webrtc::VideoSendStream implementation.
|
| VideoCaptureInput* Input() override;
|
| - bool ReconfigureVideoEncoder(const VideoEncoderConfig& config) override;
|
| + void ReconfigureVideoEncoder(const VideoEncoderConfig& config) override;
|
| Stats GetStats() override;
|
|
|
| // webrtc::CpuOveruseObserver implementation.
|
| @@ -72,8 +72,9 @@ class VideoSendStream : public webrtc::VideoSendStream,
|
| int64_t GetRtt() const;
|
| int GetPaddingNeededBps() const;
|
|
|
| + void SetSendCodec(VideoCodec video_codec);
|
| +
|
| private:
|
| - bool SetSendCodec(VideoCodec video_codec);
|
| void ConfigureSsrcs();
|
|
|
| SendStatisticsProxy stats_proxy_;
|
| @@ -91,11 +92,6 @@ class VideoSendStream : public webrtc::VideoSendStream,
|
| rtc::scoped_ptr<ViEChannel> vie_channel_;
|
| rtc::scoped_ptr<ViEEncoder> vie_encoder_;
|
| rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_;
|
| -
|
| - // Used as a workaround to indicate that we should be using the configured
|
| - // start bitrate initially, instead of the one reported by VideoEngine (which
|
| - // defaults to too high).
|
| - bool use_config_bitrate_;
|
| };
|
| } // namespace internal
|
| } // namespace webrtc
|
|
|