zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change webrtc::VideoSourceInterface to inherit rtc::VideoSourceInterface.

Browse Source 
Also introduce a typedef VideoTrackSourceInterface to be able to start changing clients such as Chrome to use the name VideoTrackSourceInterface.

Document: https://docs.google.com/a/google.com/document/d/1mEIw_0uDzyHjL3l8a82WKp6AvgR8Tlwn9JGvhbUjVpY/edit?usp=sharing

BUG=webrtc:5426

Review URL: https://codereview.webrtc.org/1758223002

Cr-Commit-Position: refs/heads/master@{#11854}
This commit is contained in:
perkj
2016-03-03 01:51:52 -08:00
committed by Commit bot
parent c8da45f329
commit f2880a0e04
8 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/api/rtpsenderreceiver_unittest.cc
View File

@ -83,16 +83,17 @@ class FakeVideoSource : public Notifier<VideoSourceInterface> {
static rtc::scoped_refptr<FakeVideoSource> Create(bool remote) {
return new rtc::RefCountedObject<FakeVideoSource>(remote);
}
virtual cricket::VideoCapturer* GetVideoCapturer() { return &fake_capturer_; }
virtual void Stop() {}
virtual void Restart() {}
virtual void AddSink(rtc::VideoSinkInterface<cricket::VideoFrame>* output) {}
virtual void RemoveSink(
rtc::VideoSinkInterface<cricket::VideoFrame>* output) {}
virtual SourceState state() const { return state_; }
virtual bool remote() const { return remote_; }
virtual const cricket::VideoOptions* options() const { return &options_; }
virtual cricket::VideoRenderer* FrameInput() { return NULL; }
cricket::VideoCapturer* GetVideoCapturer() { return &fake_capturer_; }
void Stop() override {}
void Restart() override {}
void AddOrUpdateSink(
rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
const rtc::VideoSinkWants& wants) override {}
void RemoveSink(
rtc::VideoSinkInterface<cricket::VideoFrame>* output) override {}
SourceState state() const override { return state_; }
bool remote() const override { return remote_; }
const cricket::VideoOptions* options() const override { return &options_; }
protected:
explicit FakeVideoSource(bool remote) : state_(kLive), remote_(remote) {}