Refactor VideoTracks to forward all sinks to its source

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 43 matching lines @@
   capturer_.CaptureFrame();
   EXPECT_EQ(1, renderer_1->num_rendered_frames());
 
   // FakeVideoTrackRenderer register itself to |video_track_|
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_2(
       new FakeVideoTrackRenderer(video_track_.get()));
   capturer_.CaptureFrame();
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(1, renderer_2->num_rendered_frames());
 
   video_track_->RemoveSink(renderer_1.get());

[pthatcher1, 2016/03/11 20:20:18]

Can we just do renderer_1.release() here, which removes itself when it's
destroyed?

[perkj_webrtc, 2016/03/11 21:44:56]

Done.

   capturer_.CaptureFrame();
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(2, renderer_2->num_rendered_frames());
+
+  // Need to re-add the FakeVideoTrackRenderer since its de-register itself in

[pthatcher1, 2016/03/11 20:20:17]

its de-register => it deregisters

[perkj_webrtc, 2016/03/11 21:44:56]

removed

+  // the dtor and we check if it exists in the source....
+  video_track_->AddOrUpdateSink(renderer_1.get(), rtc::VideoSinkWants());
 }
 
 // Test adding renderers to a video track and render to them by
 // providing frames to the source. Uses the old VideoTrack interface
 // with AddRenderer and RemoveRenderer.
 TEST_F(VideoTrackTest, RenderVideoOld) {
   // FakeVideoTrackRenderer register itself to |video_track_|
   rtc::scoped_ptr<FakeVideoTrackRendererOld> renderer_1(
       new FakeVideoTrackRendererOld(video_track_.get()));
 
   capturer_.CaptureFrame();
   EXPECT_EQ(1, renderer_1->num_rendered_frames());
 
   // FakeVideoTrackRenderer register itself to |video_track_|
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_2(
       new FakeVideoTrackRenderer(video_track_.get()));
 
   capturer_.CaptureFrame();
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(1, renderer_2->num_rendered_frames());
 

[pthatcher1, 2016/03/11 20:20:17]

Same here

[perkj_webrtc, 2016/03/11 21:44:57]

Done.

   video_track_->RemoveRenderer(renderer_1.get());
   capturer_.CaptureFrame();
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(2, renderer_2->num_rendered_frames());
+
+  // Need to re-add the FakeVideoTrackRenderer since its de-register itself in
+  // the dtor and we check if it exists in the source....
+  video_track_->AddOrUpdateSink(renderer_1.get(), rtc::VideoSinkWants());
 }
 
 // Test that disabling the track results in blacked out frames.
 TEST_F(VideoTrackTest, DisableTrackBlackout) {
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer(
       new FakeVideoTrackRenderer(video_track_.get()));
 
   capturer_.CaptureFrame();
   EXPECT_EQ(1, renderer->num_rendered_frames());
   EXPECT_FALSE(renderer->black_frame());
 
   video_track_->set_enabled(false);
   capturer_.CaptureFrame();
   EXPECT_EQ(2, renderer->num_rendered_frames());
   EXPECT_TRUE(renderer->black_frame());
 
   video_track_->set_enabled(true);
   capturer_.CaptureFrame();
   EXPECT_EQ(3, renderer->num_rendered_frames());
   EXPECT_FALSE(renderer->black_frame());
 }