Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: webrtc/api/rtpsenderreceiver_unittest.cc

Issue 1773993002: Add VideoTrackSource implementation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed comments Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/api/rtpsender.cc ('k') | webrtc/api/videocapturertracksource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/rtpsenderreceiver_unittest.cc
diff --git a/webrtc/api/rtpsenderreceiver_unittest.cc b/webrtc/api/rtpsenderreceiver_unittest.cc
index 5dc97c64ea155854bb7a520b96113a32edfdea14..3dfc9cc305cf4164fa2fb59fa9da689af872325e 100644
--- a/webrtc/api/rtpsenderreceiver_unittest.cc
+++ b/webrtc/api/rtpsenderreceiver_unittest.cc
@@ -19,7 +19,7 @@
#include "webrtc/api/rtpreceiver.h"
#include "webrtc/api/rtpsender.h"
#include "webrtc/api/streamcollection.h"
-#include "webrtc/api/videocapturertracksource.h"
+#include "webrtc/api/videotracksource.h"
#include "webrtc/api/videotrack.h"
#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakevideocapturer.h"
@@ -78,32 +78,20 @@ class MockVideoProvider : public VideoProviderInterface {
const cricket::VideoOptions* options));
};
-class FakeVideoSource : public Notifier<VideoTrackSourceInterface> {
+class FakeVideoTrackSource : public VideoTrackSource {
public:
- static rtc::scoped_refptr<FakeVideoSource> Create(bool remote) {
- return new rtc::RefCountedObject<FakeVideoSource>(remote);
+ static rtc::scoped_refptr<FakeVideoTrackSource> Create(bool remote) {
+ return new rtc::RefCountedObject<FakeVideoTrackSource>(remote);
}
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) {}
- ~FakeVideoSource() {}
+ explicit FakeVideoTrackSource(bool remote)
+ : VideoTrackSource(&fake_capturer_, rtc::Thread::Current(), remote) {}
+ ~FakeVideoTrackSource() {}
private:
cricket::FakeVideoCapturer fake_capturer_;
- SourceState state_;
- bool remote_;
- cricket::VideoOptions options_;
};
class RtpSenderReceiverTest : public testing::Test {
@@ -114,7 +102,7 @@ class RtpSenderReceiverTest : public testing::Test {
void AddVideoTrack(bool remote) {
rtc::scoped_refptr<VideoTrackSourceInterface> source(
- FakeVideoSource::Create(remote));
+ FakeVideoTrackSource::Create(remote));
video_track_ = VideoTrack::Create(kVideoTrackId, source);
EXPECT_TRUE(stream_->AddTrack(video_track_));
}
« no previous file with comments | « webrtc/api/rtpsender.cc ('k') | webrtc/api/videocapturertracksource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698