Change VideoRtpReceiver to create remote VideoTrack and VideoTrackSource.

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 132 matching lines @@
   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_->GetAudioTracks()[0],
                                                kAudioSsrc, &audio_provider_);
   }
 
   void CreateVideoRtpReceiver() {
-    AddVideoTrack(true);
-    EXPECT_CALL(video_provider_,
-                SetVideoPlayout(kVideoSsrc, true,
-                                video_track_->GetSink()));
-    video_rtp_receiver_ = new VideoRtpReceiver(stream_->GetVideoTracks()[0],
-                                               kVideoSsrc, &video_provider_);
+    EXPECT_CALL(video_provider_, SetVideoPlayout(kVideoSsrc, true, _));
+    video_rtp_receiver_ = new VideoRtpReceiver(
+        kVideoTrackId, rtc::Thread::Current(), kVideoSsrc, &video_provider_);
+    video_track_ = video_rtp_receiver_->video_track();

[Taylor Brandstetter, 2016/03/09 22:10:41]

Just for consistency, this should probably add the video track to the stream_.

[perkj_webrtc, 2016/03/10 00:26:38]

Done.

   }
 
   void DestroyAudioRtpReceiver() {
     EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, false));
     audio_rtp_receiver_ = nullptr;
   }
 
   void DestroyVideoRtpReceiver() {
     EXPECT_CALL(video_provider_, SetVideoPlayout(kVideoSsrc, false, NULL));
     video_rtp_receiver_ = nullptr;
@@ skipping 68 matching lines @@
 
   EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, false, _));
   video_track_->set_enabled(false);
 
   EXPECT_CALL(video_provider_, SetVideoSend(kVideoSsrc, true, _));
   video_track_->set_enabled(true);
 
   DestroyVideoRtpSender();
 }
 
+TEST_F(RtpSenderReceiverTest, RemoteVideoTrackState) {
+  CreateVideoRtpReceiver();
+
+  EXPECT_EQ(webrtc::MediaStreamTrackInterface::kLive, video_track_->state());
+  EXPECT_EQ(webrtc::MediaSourceInterface::kLive,
+            video_track_->GetSource()->state());
+
+  DestroyVideoRtpReceiver();
+
+  EXPECT_EQ(webrtc::MediaStreamTrackInterface::kEnded, video_track_->state());
+  EXPECT_EQ(webrtc::MediaSourceInterface::kEnded,
+            video_track_->GetSource()->state());
+}
+
 TEST_F(RtpSenderReceiverTest, RemoteVideoTrackDisable) {
   CreateVideoRtpReceiver();
 
   video_track_->set_enabled(false);
 
   video_track_->set_enabled(true);
 
   DestroyVideoRtpReceiver();
 }
 
@@ skipping 221 matching lines @@
                                video_track_->GetSource()->GetVideoCapturer()));
   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_, SetVideoSend(kVideoSsrc2, false, _)).Times(1);
 }
 
 }  // namespace webrtc