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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/api/rtpsenderreceiver_unittest.cc

Issue 1838413002: Combining SetVideoSend and SetSource into one method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressing pbos@'s comments. Created 4 years, 7 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/webrtcsession.h » ('j') | webrtc/media/engine/webrtcvideoengine2.cc » ('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 f8b968f54991841dd183bf88c7ff69580a1e4f87..08075dd81b2c3140907627d3fa634c815ca9b04f 100644
--- a/webrtc/api/rtpsenderreceiver_unittest.cc
+++ b/webrtc/api/rtpsenderreceiver_unittest.cc
@@ -76,17 +76,15 @@ class MockAudioProvider : public AudioProviderInterface {
class MockVideoProvider : public VideoProviderInterface {
public:
virtual ~MockVideoProvider() {}
- MOCK_METHOD2(SetSource,
- bool(uint32_t ssrc,
- rtc::VideoSourceInterface<cricket::VideoFrame>* source));
MOCK_METHOD3(SetVideoPlayout,
void(uint32_t ssrc,
bool enable,
rtc::VideoSinkInterface<cricket::VideoFrame>* sink));
- MOCK_METHOD3(SetVideoSend,
+ MOCK_METHOD4(SetVideoSend,
void(uint32_t ssrc,
bool enable,
- const cricket::VideoOptions* options));
+ const cricket::VideoOptions* options,
+ rtc::VideoSourceInterface<cricket::VideoFrame>* source));
MOCK_CONST_METHOD1(GetVideoRtpParameters, RtpParameters(uint32_t ssrc));
MOCK_METHOD2(SetVideoRtpParameters,
@@ -118,8 +116,8 @@ class RtpSenderReceiverTest : public testing::Test {
void CreateVideoRtpSender() {
AddVideoTrack();
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
+ EXPECT_CALL(video_provider_,
+ SetVideoSend(kVideoSsrc, true, _, video_track_.get()));
video_rtp_sender_ = new VideoRtpSender(stream_->GetVideoTracks()[0],
stream_->label(), &video_provider_);
video_rtp_sender_->SetSsrc(kVideoSsrc);
@@ -132,8 +130,8 @@ class RtpSenderReceiverTest : public testing::Test {
}
void DestroyVideoRtpSender() {
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, NULL)).Times(1);
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
+ EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _, nullptr))
+ .Times(1);
video_rtp_sender_ = nullptr;
}
@@ -232,10 +230,12 @@ TEST_F(RtpSenderReceiverTest, RemoteAudioTrackDisable) {
TEST_F(RtpSenderReceiverTest, LocalVideoTrackDisable) {
CreateVideoRtpSender();
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _));
+ EXPECT_CALL(video_provider_,
+ SetVideoSend(kVideoSsrc, false, _, video_track_.get()));
video_track_->set_enabled(false);
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
+ EXPECT_CALL(video_provider_,
+ SetVideoSend(kVideoSsrc, true, _, video_track_.get()));
video_track_->set_enabled(true);
DestroyVideoRtpSender();
@@ -350,13 +350,13 @@ TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupSsrcThenTrack) {
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(&video_provider_);
sender->SetSsrc(kVideoSsrc);
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
+ EXPECT_CALL(video_provider_,
+ SetVideoSend(kVideoSsrc, true, _, video_track_.get()));
sender->SetTrack(video_track_);
// Calls expected from destructor.
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
+ EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _, nullptr))
+ .Times(1);
}
// Test that a video sender calls the expected methods on the provider once
@@ -366,13 +366,13 @@ TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupTrackThenSsrc) {
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(&video_provider_);
sender->SetTrack(video_track_);
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
+ EXPECT_CALL(video_provider_,
+ SetVideoSend(kVideoSsrc, true, _, video_track_.get()));
sender->SetSsrc(kVideoSsrc);
// Calls expected from destructor.
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
+ EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _, nullptr))
+ .Times(1);
}
// Test that the sender is disconnected from the provider when its SSRC is
@@ -397,20 +397,19 @@ TEST_F(RtpSenderReceiverTest, AudioSenderSsrcSetToZero) {
// set to 0.
TEST_F(RtpSenderReceiverTest, VideoSenderSsrcSetToZero) {
AddVideoTrack();
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
+ EXPECT_CALL(video_provider_,
+ SetVideoSend(kVideoSsrc, true, _, video_track_.get()));
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(video_track_, kStreamLabel1, &video_provider_);
sender->SetSsrc(kVideoSsrc);
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
+ EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _, nullptr))
+ .Times(1);
sender->SetSsrc(0);
// Make sure it's SetSsrc that called methods on the provider, and not the
// destructor.
- EXPECT_CALL(video_provider_, SetSource(_, _)).Times(0);
- EXPECT_CALL(video_provider_, SetVideoSend(_, _, _)).Times(0);
+ EXPECT_CALL(video_provider_, SetVideoSend(_, _, _, _)).Times(0);
}
TEST_F(RtpSenderReceiverTest, AudioSenderTrackSetToNull) {
@@ -441,28 +440,24 @@ TEST_F(RtpSenderReceiverTest, VideoSenderTrackSetToNull) {
FakeVideoTrackSource::Create());
rtc::scoped_refptr<VideoTrackInterface> track =
VideoTrack::Create(kVideoTrackId, source);
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, track.get()));
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
+ EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _, track.get()));
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(track, kStreamLabel1, &video_provider_);
sender->SetSsrc(kVideoSsrc);
- // Expect that SetSource will be called before the reference to the track
+ // Expect that SetVideoSend will be called before the reference to the track
// is released.
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr))
+ EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _, nullptr))
.Times(1)
.WillOnce(InvokeWithoutArgs([&track] {
EXPECT_LT(2, track->AddRef());
track->Release();
- return true;
}));
- 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_, SetSource(_, _)).Times(0);
- EXPECT_CALL(video_provider_, SetVideoSend(_, _, _)).Times(0);
+ EXPECT_CALL(video_provider_, SetVideoSend(_, _, _, _)).Times(0);
}
TEST_F(RtpSenderReceiverTest, AudioSenderSsrcChanged) {
@@ -484,21 +479,22 @@ TEST_F(RtpSenderReceiverTest, AudioSenderSsrcChanged) {
TEST_F(RtpSenderReceiverTest, VideoSenderSsrcChanged) {
AddVideoTrack();
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, video_track_.get()));
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
+ EXPECT_CALL(video_provider_,
+ SetVideoSend(kVideoSsrc, true, _, video_track_.get()));
rtc::scoped_refptr<VideoRtpSender> sender =
new VideoRtpSender(video_track_, kStreamLabel1, &video_provider_);
sender->SetSsrc(kVideoSsrc);
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc, nullptr)).Times(1);
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _)).Times(1);
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc2, video_track_.get()));
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc2, true, _));
+ EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _, nullptr))
+ .Times(1);
+ EXPECT_CALL(video_provider_,
+ SetVideoSend(kVideoSsrc2, true, _, video_track_.get()))
+ .Times(1);
sender->SetSsrc(kVideoSsrc2);
// Calls expected from destructor.
- EXPECT_CALL(video_provider_, SetSource(kVideoSsrc2, nullptr)).Times(1);
- EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc2, false, _)).Times(1);
+ EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc2, false, _, nullptr))
+ .Times(1);
}
TEST_F(RtpSenderReceiverTest, AudioSenderCanSetParameters) {
« webrtc/api/rtpsender.cc ('K') | « webrtc/api/rtpsender.cc ('k') | webrtc/api/webrtcsession.h » ('j') | webrtc/media/engine/webrtcvideoengine2.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698