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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/api/rtpsenderreceiver_unittest.cc

Issue 1766653002: Replace SetCapturer and SetCaptureDevice by SetSource. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased. 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
« webrtc/api/rtpsender.cc ('K') | « webrtc/api/rtpsender.cc ('k') | webrtc/api/videocapturertracksource.h » ('j') | webrtc/media/base/mediachannel.h » ('J')
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 fd1c1f33b1556ec9c2f72c5d2ae65cc22298d29f..adb4015bbbefcac95bb682cb5a84296850f7b150 100644
--- a/webrtc/api/rtpsenderreceiver_unittest.cc
+++ b/webrtc/api/rtpsenderreceiver_unittest.cc
@@ -70,8 +70,9 @@ class MockAudioProvider : public AudioProviderInterface {
class MockVideoProvider : public VideoProviderInterface {
public:
virtual ~MockVideoProvider() {}
- MOCK_METHOD2(SetCaptureDevice,
- bool(uint32_t ssrc, cricket::VideoCapturer* camera));
+ MOCK_METHOD2(SetSource,
+ bool(uint32_t ssrc,
+ rtc::VideoSourceInterface<cricket::VideoFrame>* source));
MOCK_METHOD3(SetVideoPlayout,
void(uint32_t ssrc,
bool enable,
@@ -111,9 +112,7 @@ class RtpSenderReceiverTest : public testing::Test {
void CreateVideoRtpSender() {
AddVideoTrack();
- EXPECT_CALL(video_provider_,
- SetCaptureDevice(
- kVideoSsrc, video_track_->GetSource()->GetVideoCapturer()));
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
video_rtp_sender_ = new VideoRtpSender(stream_->GetVideoTracks()[0],
stream_->label(), &video_provider_);
@@ -127,7 +126,7 @@ class RtpSenderReceiverTest : public testing::Test {
}
void DestroyVideoRtpSender() {
- EXPECT_CALL(video_provider_, SetCaptureDevice(kVideoSsrc, NULL)).Times(1);
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, NULL)).Times(1);
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
video_rtp_sender_ = nullptr;
}
@@ -344,14 +343,12 @@ TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupSsrcThenTrack) {
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(&video_provider_);
sender->SetSsrc(kVideoSsrc);
- EXPECT_CALL(video_provider_,
- SetCaptureDevice(kVideoSsrc,
- video_track_->GetSource()->GetVideoCapturer()));
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
sender->SetTrack(video_track_);
// Calls expected from destructor.
- EXPECT_CALL(video_provider_, SetCaptureDevice(kVideoSsrc, nullptr)).Times(1);
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
}
@@ -362,14 +359,12 @@ TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupTrackThenSsrc) {
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(&video_provider_);
sender->SetTrack(video_track_);
- EXPECT_CALL(video_provider_,
- SetCaptureDevice(kVideoSsrc,
- video_track_->GetSource()->GetVideoCapturer()));
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
sender->SetSsrc(kVideoSsrc);
// Calls expected from destructor.
- EXPECT_CALL(video_provider_, SetCaptureDevice(kVideoSsrc, nullptr)).Times(1);
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
}
@@ -395,21 +390,19 @@ TEST_F(RtpSenderReceiverTest, AudioSenderSsrcSetToZero) {
// set to 0.
TEST_F(RtpSenderReceiverTest, VideoSenderSsrcSetToZero) {
AddVideoTrack();
- EXPECT_CALL(video_provider_,
- SetCaptureDevice(kVideoSsrc,
- video_track_->GetSource()->GetVideoCapturer()));
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(video_track_, kStreamLabel1, &video_provider_);
sender->SetSsrc(kVideoSsrc);
- EXPECT_CALL(video_provider_, SetCaptureDevice(kVideoSsrc, nullptr)).Times(1);
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
sender->SetSsrc(0);
// Make sure it's SetSsrc that called methods on the provider, and not the
// destructor.
- EXPECT_CALL(video_provider_, SetCaptureDevice(_, _)).Times(0);
+ EXPECT_CALL(video_provider_, SetSource(_, _)).Times(0);
EXPECT_CALL(video_provider_, SetVideoSend(_, _, _)).Times(0);
}
@@ -431,21 +424,19 @@ TEST_F(RtpSenderReceiverTest, AudioSenderTrackSetToNull) {
TEST_F(RtpSenderReceiverTest, VideoSenderTrackSetToNull) {
AddVideoTrack();
- EXPECT_CALL(video_provider_,
- SetCaptureDevice(kVideoSsrc,
- video_track_->GetSource()->GetVideoCapturer()));
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(video_track_, kStreamLabel1, &video_provider_);
sender->SetSsrc(kVideoSsrc);
- EXPECT_CALL(video_provider_, SetCaptureDevice(kVideoSsrc, nullptr)).Times(1);
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
EXPECT_TRUE(sender->SetTrack(nullptr));
// Make sure it's SetTrack that called methods on the provider, and not the
// destructor.
- EXPECT_CALL(video_provider_, SetCaptureDevice(_, _)).Times(0);
+ EXPECT_CALL(video_provider_, SetSource(_, _)).Times(0);
EXPECT_CALL(video_provider_, SetVideoSend(_, _, _)).Times(0);
}
@@ -468,24 +459,20 @@ TEST_F(RtpSenderReceiverTest, AudioSenderSsrcChanged) {
TEST_F(RtpSenderReceiverTest, VideoSenderSsrcChanged) {
AddVideoTrack();
- EXPECT_CALL(video_provider_,
- SetCaptureDevice(kVideoSsrc,
- video_track_->GetSource()->GetVideoCapturer()));
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(video_track_, kStreamLabel1, &video_provider_);
sender->SetSsrc(kVideoSsrc);
- EXPECT_CALL(video_provider_, SetCaptureDevice(kVideoSsrc, nullptr)).Times(1);
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
- EXPECT_CALL(video_provider_,
- SetCaptureDevice(kVideoSsrc2,
- video_track_->GetSource()->GetVideoCapturer()));
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc2, video_track_.get()));
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc2, true, _));
sender->SetSsrc(kVideoSsrc2);
// Calls expected from destructor.
- EXPECT_CALL(video_provider_, SetCaptureDevice(kVideoSsrc2, nullptr)).Times(1);
+ EXPECT_CALL(video_provider_, SetSource(kVideoSsrc2, nullptr)).Times(1);
EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc2, false, _)).Times(1);
}
« webrtc/api/rtpsender.cc ('K') | « webrtc/api/rtpsender.cc ('k') | webrtc/api/videocapturertracksource.h » ('j') | webrtc/media/base/mediachannel.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698