Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface.

webrtc/api/videotrack_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 37 matching lines @@
                             new webrtc::RemoteVideoCapturer(), NULL, true));
   }
 
  protected:
   rtc::scoped_ptr<cricket::ChannelManager> channel_manager_;
   rtc::scoped_refptr<VideoTrackInterface> video_track_;
 };
 
 // Test adding renderers to a video track and render to them by providing
 // frames to the source.
 TEST_F(VideoTrackTest, RenderVideo) {

[perkj_webrtc, 2016/02/12 14:40:14]

please add a new test like this that use the new methods.

[nisse-webrtc, 2016/02/15 08:54:48]

Hmm. The only VideoTrack method called directly here is the RemoveSink at the
end (which could be RemoveRenderer instead, I don't think it matters much).

So then we'd need two different FakeVideoTrackRenderer-style classes, using the
old and new interface, and one testcase using each. Right?

   // FakeVideoTrackRenderer register itself to |video_track_|
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_1(
       new FakeVideoTrackRenderer(video_track_.get()));
 
   rtc::VideoSinkInterface<cricket::VideoFrame>* renderer_input =
       video_track_->GetSink();
   ASSERT_FALSE(renderer_input == NULL);
 
   cricket::WebRtcVideoFrame frame;
   frame.InitToBlack(123, 123, 0);
@@ skipping 10 matching lines @@
   renderer_input->OnFrame(frame);
 
   EXPECT_EQ(123, renderer_1->width());
   EXPECT_EQ(123, renderer_1->height());
   EXPECT_EQ(123, renderer_2->width());
   EXPECT_EQ(123, renderer_2->height());
 
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(1, renderer_2->num_rendered_frames());
 
-  video_track_->RemoveRenderer(renderer_1.get());
+  video_track_->RemoveSink(renderer_1.get());

[perkj_webrtc, 2016/02/12 14:40:14]

This should not be necessary ? 

[nisse-webrtc, 2016/02/15 08:54:48]

I tried to purge all calls to the deprecated RemoveRenderer method from the
webrtc code. But such changes can be postponed to some later cl, if you prefer.

   renderer_input->OnFrame(frame);
 
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(2, renderer_2->num_rendered_frames());
 }
 
 // Test that disabling the track results in blacked out frames.
 TEST_F(VideoTrackTest, DisableTrackBlackout) {
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer(
       new FakeVideoTrackRenderer(video_track_.get()));
@@ skipping 20 matching lines @@
   EXPECT_EQ(100, renderer->width());
   EXPECT_EQ(200, renderer->height());
 
   video_track_->set_enabled(true);
   renderer_input->OnFrame(frame);
   EXPECT_EQ(3, renderer->num_rendered_frames());
   EXPECT_FALSE(renderer->black_frame());
   EXPECT_EQ(100, renderer->width());
   EXPECT_EQ(200, renderer->height());
 }