Refactor VideoTracks to forward all sinks to its source

webrtc/api/videotrack.cc

Index: webrtc/api/videotrack.cc
diff --git a/webrtc/api/videotrack.cc b/webrtc/api/videotrack.cc
index b2ea1f9dc2c69bdba20021c590ed216196b392a6..98a257419da538fea719a4061b1ad196ce822655 100644
--- a/webrtc/api/videotrack.cc
+++ b/webrtc/api/videotrack.cc
@@ -20,19 +20,9 @@ VideoTrack::VideoTrack(const std::string& label,
                        VideoTrackSourceInterface* video_source)
     : MediaStreamTrack<VideoTrackInterface>(label),
       video_source_(video_source) {
-  // TODO(perkj): Sinks should register directly to the source so that
-  // VideoSinkWants can be applied correctly per sink. For now, |renderers_|
-  // must be able to apply rotation. Note that this is only actual renderers,
-  // not sinks that connect directly to cricket::VideoCapture.
-  rtc::VideoSinkWants wants;
-  wants.rotation_applied = false;
-  if (video_source_)
-    video_source_->AddOrUpdateSink(&renderers_, wants);
 }
 
 VideoTrack::~VideoTrack() {
-  if (video_source_)
-    video_source_->RemoveSink(&renderers_);
 }
 
 std::string VideoTrack::kind() const {
@@ -42,19 +32,51 @@ std::string VideoTrack::kind() const {
 void VideoTrack::AddOrUpdateSink(
     rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
     const rtc::VideoSinkWants& wants) {
-  renderers_.AddOrUpdateSink(sink, wants);
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  SinkPair* sink_pair = FindSinkPair(sink);
+  if (!sink_pair) {
+    sinks_.push_back(SinkPair(sink, wants));
+  } else {
+    sink_pair->wants = wants;
+  }
+  rtc::VideoSinkWants modified_wants = wants;
+  modified_wants.black_frames = !enabled();
+  video_source_->AddOrUpdateSink(sink, modified_wants);
 }
 
 void VideoTrack::RemoveSink(
     rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
-  renderers_.RemoveSink(sink);
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  RTC_DCHECK(FindSinkPair(sink));
+  sinks_.erase(std::remove_if(sinks_.begin(), sinks_.end(),
+                              [sink](const SinkPair& sink_pair) {
+                                return sink_pair.sink == sink;
+                              }),
+               sinks_.end());
+  video_source_->RemoveSink(sink);
 }
 
 bool VideoTrack::set_enabled(bool enable) {
-  renderers_.SetEnabled(enable);
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  for (auto& sink_pair : sinks_) {
+    rtc::VideoSinkWants modified_wants = sink_pair.wants;
+    modified_wants.black_frames = !enable;
+    video_source_->AddOrUpdateSink(sink_pair.sink, modified_wants);
+  }
   return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable);
 }
 
+VideoTrack::SinkPair* VideoTrack::FindSinkPair(
+    const rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
+  auto sink_pair_it = std::find_if(
+      sinks_.begin(), sinks_.end(),
+      [sink](const SinkPair& sink_pair) { return sink_pair.sink == sink; });
+  if (sink_pair_it != sinks_.end()) {
+    return &*sink_pair_it;
+  }
+  return nullptr;
+}

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

Can we make a VideoSourceBase that implements a VideoSourceInterface?  That way,
the VideoBroadcaster and VideoTrack could both share the common
sinks_/find/add/remove logic.

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

Done.

+
 rtc::scoped_refptr<VideoTrack> VideoTrack::Create(
     const std::string& id,
     VideoTrackSourceInterface* source) {