admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated VideoTrackSource constructor.

Browse Source 
This is a followup to
https://webrtc-review.googlesource.com/c/src/+/78403

Bug: None
Change-Id: I6dc29b13b333ff8836d7d0f3dc21aba0ad66b5bb
Reviewed-on: https://webrtc-review.googlesource.com/80243
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23568}
This commit is contained in:
Niels Möller 2018-05-31 15:36:49 +02:00 committed by Commit Bot
parent 2ac64467c4
commit c17ca5354a
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc/videotracksource.cc
View File

@ -14,13 +14,9 @@
namespace webrtc {
VideoTrackSource::VideoTrackSource(bool remote)
: VideoTrackSource(nullptr, remote) {}
VideoTrackSource::VideoTrackSource(
rtc::VideoSourceInterface<VideoFrame>* source,
bool remote)
: source_(source), state_(kInitializing), remote_(remote) {
: state_(kInitializing), remote_(remote) {
worker_thread_checker_.DetachFromThread();
}

8
pc/videotracksource.h
View File

@ -24,8 +24,6 @@ namespace webrtc {
class VideoTrackSource : public Notifier<VideoTrackSourceInterface> {
public:
explicit VideoTrackSource(bool remote);
// TODO(nisse): Delete, kept only for temporary backwards compatibility.
VideoTrackSource(rtc::VideoSourceInterface<VideoFrame>* source, bool remote);
void SetState(SourceState new_state);
SourceState state() const override { return state_; }
@ -41,14 +39,10 @@ class VideoTrackSource : public Notifier<VideoTrackSourceInterface> {
void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override;
protected:
// TODO(nisse): Default implementations for temporary backwards
// compatibility.
virtual rtc::VideoSourceInterface<VideoFrame>* source() { return source_; }
virtual rtc::VideoSourceInterface<VideoFrame>* source() = 0;
private:
rtc::ThreadChecker worker_thread_checker_;
// TODO(nisse): Delete, kept only for temporary backwards compatibility.
rtc::VideoSourceInterface<VideoFrame>* source_;
SourceState state_;
const bool remote_;
};