| Index: remoting/protocol/webrtc_frame_scheduler_simple.h
|
| diff --git a/remoting/protocol/webrtc_frame_scheduler_simple.h b/remoting/protocol/webrtc_frame_scheduler_simple.h
|
| index 86c54273f72398841eee2e94013ddf58996794b2..6a38b39dd1bab9f6f5778c5778ccd3b70b04d566 100644
|
| --- a/remoting/protocol/webrtc_frame_scheduler_simple.h
|
| +++ b/remoting/protocol/webrtc_frame_scheduler_simple.h
|
| @@ -7,9 +7,11 @@
|
|
|
| #include "remoting/protocol/webrtc_frame_scheduler.h"
|
|
|
| +#include "base/threading/thread_checker.h"
|
| #include "base/timer/timer.h"
|
| #include "remoting/base/leaky_bucket.h"
|
| #include "remoting/base/running_samples.h"
|
| +#include "remoting/protocol/video_channel_state_observer.h"
|
|
|
| namespace remoting {
|
| namespace protocol {
|
| @@ -17,16 +19,21 @@ namespace protocol {
|
| // WebrtcFrameSchedulerSimple is a simple implementation of
|
| // WebrtcFrameScheduler that always keeps only one frame in the pipeline.
|
| // It schedules each frame after the previous one is expected to finish sending.
|
| -class WebrtcFrameSchedulerSimple : public WebrtcFrameScheduler {
|
| +class WebrtcFrameSchedulerSimple : public VideoChannelStateObserver,
|
| + public WebrtcFrameScheduler {
|
| public:
|
| WebrtcFrameSchedulerSimple();
|
| ~WebrtcFrameSchedulerSimple() override;
|
|
|
| + // VideoChannelStateObserver implementation.
|
| + void OnKeyFrameRequested() override;
|
| + void OnChannelParameters(int packet_loss, base::TimeDelta rtt) override;
|
| + void OnTargetBitrateChanged(int bitrate_kbps) override;
|
| +
|
| // WebrtcFrameScheduler implementation.
|
| - void Start(const base::Closure& capture_callback) override;
|
| + void Start(WebrtcDummyVideoEncoderFactory* video_encoder_factory,
|
| + const base::Closure& capture_callback) override;
|
| void Pause(bool pause) override;
|
| - void SetKeyFrameRequest() override;
|
| - void SetTargetBitrate(int bitrate_kbps) override;
|
| bool GetEncoderFrameParams(
|
| const webrtc::DesktopFrame& frame,
|
| WebrtcVideoEncoder::FrameParams* params_out) override;
|
| @@ -56,6 +63,9 @@ class WebrtcFrameSchedulerSimple : public WebrtcFrameScheduler {
|
| RunningSamples updated_region_area_;
|
|
|
| base::OneShotTimer capture_timer_;
|
| +
|
| + base::ThreadChecker thread_checker_;
|
| + base::WeakPtrFactory<WebrtcFrameSchedulerSimple> weak_factory_;
|
| };
|
|
|
| } // namespace protocol
|
|
|