From 859e86107d71e7702651e2a2f738b7ff2fd58be0 Mon Sep 17 00:00:00 2001 From: sakal Date: Tue, 6 Sep 2016 02:25:08 -0700 Subject: [PATCH] Remove stop method from VideoTrackSourceInterface. This method is no longer needed. Follow-up on CL: https://codereview.webrtc.org/2306013002/ Review-Url: https://codereview.webrtc.org/2312603003 Cr-Commit-Position: refs/heads/master@{#14085} --- webrtc/api/androidvideotracksource.h | 4 ---- webrtc/api/mediastreaminterface.h | 2 -- webrtc/api/videocapturertracksource.h | 4 ++-- webrtc/api/videosourceproxy.h | 1 - webrtc/api/videotracksource.h | 2 -- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/webrtc/api/androidvideotracksource.h b/webrtc/api/androidvideotracksource.h index 79d0df2b0b..2bbecc82c9 100644 --- a/webrtc/api/androidvideotracksource.h +++ b/webrtc/api/androidvideotracksource.h @@ -34,10 +34,6 @@ class AndroidVideoTrackSource : public Notifier { jobject j_egl_context, bool is_screencast = false); - // Not used on Android. - // TODO(sakal/magjed): Try to remove this from the interface. - void Stop() override { RTC_NOTREACHED(); }; - bool is_screencast() const override { return is_screencast_; } // Indicates that the encoder should denoise video before encoding it. diff --git a/webrtc/api/mediastreaminterface.h b/webrtc/api/mediastreaminterface.h index 33d5e5f2c5..988ee84383 100644 --- a/webrtc/api/mediastreaminterface.h +++ b/webrtc/api/mediastreaminterface.h @@ -106,8 +106,6 @@ class VideoTrackSourceInterface int input_height; }; - virtual void Stop() = 0; - // Indicates that parameters suitable for screencasts should be automatically // applied to RtpSenders. // TODO(perkj): Remove these once all known applications have moved to diff --git a/webrtc/api/videocapturertracksource.h b/webrtc/api/videocapturertracksource.h index e7bbfd2287..b0a2810b76 100644 --- a/webrtc/api/videocapturertracksource.h +++ b/webrtc/api/videocapturertracksource.h @@ -57,8 +57,6 @@ class VideoCapturerTrackSource : public VideoTrackSource, bool GetStats(Stats* stats) override; - void Stop() override; - protected: VideoCapturerTrackSource(rtc::Thread* worker_thread, cricket::VideoCapturer* capturer, @@ -67,6 +65,8 @@ class VideoCapturerTrackSource : public VideoTrackSource, void Initialize(const webrtc::MediaConstraintsInterface* constraints); private: + void Stop(); + void OnStateChange(cricket::VideoCapturer* capturer, cricket::CaptureState capture_state); diff --git a/webrtc/api/videosourceproxy.h b/webrtc/api/videosourceproxy.h index 40f81dc690..0c181611ee 100644 --- a/webrtc/api/videosourceproxy.h +++ b/webrtc/api/videosourceproxy.h @@ -23,7 +23,6 @@ namespace webrtc { BEGIN_PROXY_MAP(VideoTrackSource) PROXY_CONSTMETHOD0(SourceState, state) PROXY_CONSTMETHOD0(bool, remote) - PROXY_METHOD0(void, Stop) PROXY_CONSTMETHOD0(bool, is_screencast) PROXY_CONSTMETHOD0(rtc::Optional, needs_denoising) PROXY_METHOD1(bool, GetStats, Stats*) diff --git a/webrtc/api/videotracksource.h b/webrtc/api/videotracksource.h index 1d1d579d61..67e764fd40 100644 --- a/webrtc/api/videotracksource.h +++ b/webrtc/api/videotracksource.h @@ -33,8 +33,6 @@ class VideoTrackSource : public Notifier { SourceState state() const override { return state_; } bool remote() const override { return remote_; } - void Stop() override{}; - bool is_screencast() const override { return false; } rtc::Optional needs_denoising() const override { return rtc::Optional(); }