| Index: webrtc/video/vie_encoder.h
|
| diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
|
| index 734495143840e9b5224b5b95d17df69edd6968cd..319300c5d447f36ff76561b6980d18e6e746f8c4 100644
|
| --- a/webrtc/video/vie_encoder.h
|
| +++ b/webrtc/video/vie_encoder.h
|
| @@ -78,7 +78,7 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
| uint8_t pl_type,
|
| bool internal_source);
|
| int32_t DeRegisterExternalEncoder(uint8_t pl_type);
|
| - void SetEncoder(const VideoCodec& video_codec);
|
| + void SetEncoder(const VideoCodec& video_codec, int min_transmit_bitrate_bps);
|
|
|
| // Implementing VideoCaptureCallback.
|
| void DeliverFrame(VideoFrame video_frame) override;
|
| @@ -112,8 +112,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
| virtual void OnReceivedSLI(uint32_t ssrc, uint8_t picture_id);
|
| virtual void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id);
|
|
|
| - void SetMinTransmitBitrate(int min_transmit_bitrate_kbps);
|
| -
|
| // Lets the sender suspend video when the rate drops below
|
| // |threshold_bps|, and turns back on when the rate goes back up above
|
| // |threshold_bps| + |window_bps|.
|
| @@ -158,7 +156,7 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
| // padding.
|
| int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
|
| VideoCodec encoder_config_ GUARDED_BY(data_cs_);
|
| - int min_transmit_bitrate_kbps_ GUARDED_BY(data_cs_);
|
| + int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);
|
| uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
|
| bool network_is_transmitting_ GUARDED_BY(data_cs_);
|
| bool encoder_paused_ GUARDED_BY(data_cs_);
|
|
|