Combining SetVideoSend and SetSource into one method.

webrtc/api/rtpsenderreceiver_unittest.cc

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 62 matching lines @@
   }
 
  private:
   std::unique_ptr<AudioSinkInterface> sink_;
 };
 
 // Helper class to test RtpSender/RtpReceiver.
 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(GetVideoRtpSendParameters, RtpParameters(uint32_t ssrc));
   MOCK_METHOD2(SetVideoRtpSendParameters,
                bool(uint32_t ssrc, const RtpParameters&));
   MOCK_CONST_METHOD1(GetVideoRtpReceiveParameters,
                      RtpParameters(uint32_t ssrc));
   MOCK_METHOD2(SetVideoRtpReceiveParameters,
                bool(uint32_t ssrc, const RtpParameters&));
 };
 
@@ skipping 15 matching lines @@
     EXPECT_TRUE(stream_->AddTrack(audio_track_));
     EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc, true, _, _));
     audio_rtp_sender_ =
         new AudioRtpSender(stream_->GetAudioTracks()[0], stream_->label(),
                            &audio_provider_, nullptr);
     audio_rtp_sender_->SetSsrc(kAudioSsrc);
   }
 
   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);
   }
 
   void DestroyAudioRtpSender() {
     EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc, false, _, _))
         .Times(1);
     audio_rtp_sender_ = nullptr;
   }
 
   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;
   }
 
   void CreateAudioRtpReceiver() {
     audio_track_ = AudioTrack::Create(
         kAudioTrackId, RemoteAudioSource::Create(kAudioSsrc, NULL));
     EXPECT_TRUE(stream_->AddTrack(audio_track_));
     EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true));
     audio_rtp_receiver_ = new AudioRtpReceiver(stream_, kAudioTrackId,
                                                kAudioSsrc, &audio_provider_);
@@ skipping 78 matching lines @@
 
   EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true));
   audio_track_->set_enabled(true);
 
   DestroyAudioRtpReceiver();
 }
 
 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();
 }
 
 TEST_F(RtpSenderReceiverTest, RemoteVideoTrackState) {
   CreateVideoRtpReceiver();
 
   EXPECT_EQ(webrtc::MediaStreamTrackInterface::kLive, video_track_->state());
   EXPECT_EQ(webrtc::MediaSourceInterface::kLive,
@@ skipping 94 matching lines @@
   EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc, false, _, _)).Times(1);
 }
 
 // Test that a video sender calls the expected methods on the provider once
 // it has a track and SSRC, when the SSRC is set first.
 TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupSsrcThenTrack) {
   AddVideoTrack();
   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
 // it has a track and SSRC, when the SSRC is set last.
 TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupTrackThenSsrc) {
   AddVideoTrack();
   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
 // set to 0.
 TEST_F(RtpSenderReceiverTest, AudioSenderSsrcSetToZero) {
   rtc::scoped_refptr<AudioTrackInterface> track =
       AudioTrack::Create(kAudioTrackId, nullptr);
   EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc, true, _, _));
   rtc::scoped_refptr<AudioRtpSender> sender =
       new AudioRtpSender(track, kStreamLabel1, &audio_provider_, nullptr);
   sender->SetSsrc(kAudioSsrc);
 
   EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc, false, _, _)).Times(1);
   sender->SetSsrc(0);
 
   // Make sure it's SetSsrc that called methods on the provider, and not the
   // destructor.
   EXPECT_CALL(audio_provider_, SetAudioSend(_, _, _, _)).Times(0);
 }
 
 // Test that the sender is disconnected from the provider when its SSRC is
 // 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) {
   rtc::scoped_refptr<AudioTrackInterface> track =
       AudioTrack::Create(kAudioTrackId, nullptr);
   EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc, true, _, _));
   rtc::scoped_refptr<AudioRtpSender> sender =
       new AudioRtpSender(track, kStreamLabel1, &audio_provider_, nullptr);
   sender->SetSsrc(kAudioSsrc);
 
@@ skipping 10 matching lines @@
   // Make sure it's SetTrack that called methods on the provider, and not the
   // destructor.
   EXPECT_CALL(audio_provider_, SetAudioSend(_, _, _, _)).Times(0);
 }
 
 TEST_F(RtpSenderReceiverTest, VideoSenderTrackSetToNull) {
   rtc::scoped_refptr<VideoTrackSourceInterface> source(
       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) {
   AddVideoTrack();
   rtc::scoped_refptr<AudioTrackInterface> track =
       AudioTrack::Create(kAudioTrackId, nullptr);
   EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc, true, _, _));
   rtc::scoped_refptr<AudioRtpSender> sender =
       new AudioRtpSender(track, kStreamLabel1, &audio_provider_, nullptr);
   sender->SetSsrc(kAudioSsrc);
 
   EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc, false, _, _)).Times(1);
   EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc2, true, _, _)).Times(1);
   sender->SetSsrc(kAudioSsrc2);
 
   // Calls expected from destructor.
   EXPECT_CALL(audio_provider_, SetAudioSend(kAudioSsrc2, false, _, _)).Times(1);
 }
 
 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) {
   CreateAudioRtpSender();
 
   EXPECT_CALL(audio_provider_, GetAudioRtpSendParameters(kAudioSsrc))
       .WillOnce(Return(RtpParameters()));
   EXPECT_CALL(audio_provider_, SetAudioRtpSendParameters(kAudioSsrc, _))
       .WillOnce(Return(true));
   RtpParameters params = audio_rtp_sender_->GetParameters();
@@ skipping 35 matching lines @@
       .WillOnce(Return(RtpParameters()));
   EXPECT_CALL(video_provider_, SetVideoRtpReceiveParameters(kVideoSsrc, _))
       .WillOnce(Return(true));
   RtpParameters params = video_rtp_receiver_->GetParameters();
   EXPECT_TRUE(video_rtp_receiver_->SetParameters(params));
 
   DestroyVideoRtpReceiver();
 }
 
 }  // namespace webrtc