| Index: webrtc/video_send_stream.h
|
| diff --git a/webrtc/video_send_stream.h b/webrtc/video_send_stream.h
|
| index 43283a55da1e959cd03c098c7e796376f3b9c6ed..058a6c8bc991f0d4c0dff0b72644ce88db12ac8e 100644
|
| --- a/webrtc/video_send_stream.h
|
| +++ b/webrtc/video_send_stream.h
|
| @@ -27,7 +27,6 @@
|
|
|
| namespace webrtc {
|
|
|
| -class LoadObserver;
|
| class VideoEncoder;
|
|
|
| class VideoSendStream {
|
| @@ -66,6 +65,10 @@ class VideoSendStream {
|
| int preferred_media_bitrate_bps = 0;
|
| bool suspended = false;
|
| bool bw_limited_resolution = false;
|
| + bool cpu_limited_resolution = false;
|
| + // Total number of times resolution as been requested to be changed due to
|
| + // CPU adaptation.
|
| + int number_of_cpu_adapt_changes = 0;
|
| std::map<uint32_t, StreamStats> substreams;
|
| };
|
|
|
| @@ -150,10 +153,6 @@ class VideoSendStream {
|
| // Transport for outgoing packets.
|
| Transport* send_transport = nullptr;
|
|
|
| - // Callback for overuse and normal usage based on the jitter of incoming
|
| - // captured frames. 'nullptr' disables the callback.
|
| - LoadObserver* overuse_callback = nullptr;
|
| -
|
| // Called for each I420 frame before encoding the frame. Can be used for
|
| // effects, snapshots etc. 'nullptr' disables the callback.
|
| rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback = nullptr;
|
| @@ -191,8 +190,8 @@ class VideoSendStream {
|
| // When a stream is stopped, it can't receive, process or deliver packets.
|
| virtual void Stop() = 0;
|
|
|
| - virtual void SetSource(
|
| - rtc::VideoSourceInterface<webrtc::VideoFrame>* source) = 0;
|
| + virtual void SetSource(rtc::VideoSourceInterface<webrtc::VideoFrame>* source,
|
| + bool disable_resolution_scaling) = 0;
|
|
|
| // Set which streams to send. Must have at least as many SSRCs as configured
|
| // in the config. Encoder settings are passed on to the encoder instance along
|
|
|