Replace interface VideoCapturerInput with VideoSinkInterface.

webrtc/media/engine/webrtcvideoengine2.cc

Index: webrtc/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index b72c4aae747e34488b7f6892535dbeb7624651a9..557dfeffd139d1cb561c37d36e53982d70c0052c 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -1580,6 +1580,7 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::WebRtcVideoSendStream(
       source_(nullptr),
       external_encoder_factory_(external_encoder_factory),
       stream_(nullptr),
+      encoder_sink_(nullptr),
       parameters_(std::move(config), options, max_bitrate_bps, codec_settings),
       rtp_parameters_(CreateRtpParametersWithOneEncoding()),
       pending_encoder_reconfiguration_(false),
@@ -1659,7 +1660,7 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::OnFrame(
                  << ", texture=" << last_frame_info_.is_texture;
   }
 
-  if (stream_ == NULL) {
+  if (encoder_sink_ == NULL) {
     // Frame input before send codecs are configured, dropping frame.
     return;
   }
@@ -1682,7 +1683,7 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::OnFrame(
   if (cpu_restricted_counter_ > 0)
     ++cpu_restricted_frame_count_;
 
-  stream_->Input()->IncomingCapturedFrame(video_frame);
+  encoder_sink_->OnFrame(video_frame);
 }
 
 bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoSend(
@@ -1705,7 +1706,7 @@ bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoSend(
     if (options_present) {
       VideoOptions old_options = parameters_.options;
       parameters_.options.SetAll(*options);
-      // Reconfigure encoder settings on the naext frame or stream
+      // Reconfigure encoder settings on the next frame or stream
       // recreation if the options changed.
       if (parameters_.options != old_options) {
         pending_encoder_reconfiguration_ = true;
@@ -1713,7 +1714,7 @@ bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoSend(
     }
 
     if (source_changing) {
-      if (source == nullptr && stream_ != nullptr) {
+      if (source == nullptr && encoder_sink_ != nullptr) {
         LOG(LS_VERBOSE) << "Disabling capturer, sending black frame.";
         // Force this black frame not to be dropped due to timestamp order
         // check. As IncomingCapturedFrame will drop the frame if this frame's
@@ -1726,9 +1727,8 @@ bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoSend(
                                        last_frame_info_.height));
         black_buffer->SetToBlack();
 
-        stream_->Input()->IncomingCapturedFrame(webrtc::VideoFrame(
-            black_buffer, last_frame_info_.rotation,
-            last_frame_timestamp_us_));
+        encoder_sink_->OnFrame(webrtc::VideoFrame(
+            black_buffer, last_frame_info_.rotation, last_frame_timestamp_us_));
       }
       source_ = source;
     }
@@ -1744,7 +1744,7 @@ bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoSend(
 
 void WebRtcVideoChannel2::WebRtcVideoSendStream::DisconnectSource() {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  if (source_ == NULL) {
+  if (source_ == nullptr) {
     return;
   }
 
@@ -2050,6 +2050,23 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetSend(bool send) {
   UpdateSendState();
 }
 
+void WebRtcVideoChannel2::WebRtcVideoSendStream::AddOrUpdateSink(

[stefan-webrtc, 2016/09/13 09:26:43]

Add sounds like several sinks are supported, which doesn't seem to be the case?

[perkj_webrtc, 2016/09/14 14:20:22]

Nope- there is a 1-1 mapping between sendstream and encoder. End goal is
probably connect the encoder with the capturer. The capturer can have multiple
sinks.

+    VideoSinkInterface<webrtc::VideoFrame>* sink,
+    const rtc::VideoSinkWants& wants) {
+  // TODO(perkj): Actually consider the encoder |wants| and remove
+  // WebRtcVideoSendStream::OnLoadUpdate(Load load).
+  rtc::CritScope cs(&lock_);
+  RTC_DCHECK(!encoder_sink_ || encoder_sink_ == sink);

[stefan-webrtc, 2016/09/13 09:26:43]

It looks error prone to allow adding the same sink twice. Why is that needed?

[perkj_webrtc, 2016/09/14 14:20:22]

For updating the wants. Will be done in a follow up cl.

+  encoder_sink_ = sink;
+}
+
+void WebRtcVideoChannel2::WebRtcVideoSendStream::RemoveSink(
+    VideoSinkInterface<webrtc::VideoFrame>* sink) {
+  rtc::CritScope cs(&lock_);
+  RTC_DCHECK(encoder_sink_ == sink);

[stefan-webrtc, 2016/09/13 09:26:43]

DCHECK_EQ

[perkj_webrtc, 2016/09/14 14:20:22]

Done.

+  encoder_sink_ = nullptr;
+}
+
 void WebRtcVideoChannel2::WebRtcVideoSendStream::OnLoadUpdate(Load load) {
   if (worker_thread_ != rtc::Thread::Current()) {
     invoker_.AsyncInvoke<void>(
@@ -2242,6 +2259,7 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::RecreateWebRtcStream() {
   }
   stream_ = call_->CreateVideoSendStream(std::move(config),
                                          parameters_.encoder_config.Copy());
+  stream_->SetSource(this);
 
   parameters_.encoder_config.encoder_specific_settings = NULL;
   pending_encoder_reconfiguration_ = false;