Make cricket::VideoCapturer implement VideoSourceInterface

talk/media/base/videosourcebase.cc

 /*
  * libjingle
- * Copyright 2013 Google Inc.
+ * Copyright 2016 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
  *     this list of conditions and the following disclaimer in the documentation
  *     and/or other materials provided with the distribution.
  *  3. The name of the author may not be used to endorse or promote products
  *     derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
  * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_APP_WEBRTC_SCTPUTILS_H_
-#define TALK_APP_WEBRTC_SCTPUTILS_H_
+#include "talk/media/base/videosourcebase.h"
 
-#include <string>
-
-#include "talk/app/webrtc/datachannelinterface.h"
+#include "webrtc/base/checks.h"
 
 namespace rtc {
-class Buffer;
+
+void VideoSourceBase::AddSink(VideoSinkInterface<cricket::VideoFrame>* sink,
+                              const VideoSinkCapabilities& capabilities) {
+  rtc::CritScope cs(&sink_lock_);
+  RTC_DCHECK(sink != nullptr);
+  RTC_DCHECK(sinks_.find(sink) == sinks_.end());

[nisse-webrtc, 2016/02/03 09:16:34]

This seems pointless when using a set.

[pthatcher1, 2016/02/03 15:38:36]

And even if we change to a vector, it should probably just return early (no-op).

[perkj_webrtc, 2016/02/08 14:32:01]

I prefer finding and if possible - fix clients that calls this twice or with
null.

+  // TODO(perkj): Refactor to allow different sinks to have different
+  // capabilities.
+  RTC_DCHECK(sinks_.empty() || capabilities.equals(capabilities));
+  capabilities_ = capabilities;
+  sinks_.insert(sink);
+  OnSinkCapabilitiesChanged(capabilities_);
+}
+
+void VideoSourceBase::RemoveSink(
+    VideoSinkInterface<cricket::VideoFrame>* sink) {
+  RTC_DCHECK(sink != nullptr);
+
+  rtc::CritScope cs(&sink_lock_);
+  RTC_DCHECK(sinks_.find(sink) != sinks_.end());
+  sinks_.erase(sink);
+}
+
+void VideoSourceBase::DeliverFrameToSinks(const cricket::VideoFrame& frame) {
+  rtc::CritScope cs(&sink_lock_);
+  for (auto* sink : sinks_) {
+    sink->OnFrame(frame);
+  }
+}
+
 }  // namespace rtc
-
-namespace webrtc {
-struct DataChannelInit;
-
-// Read the message type and return true if it's an OPEN message.
-bool IsOpenMessage(const rtc::Buffer& payload);
-
-bool ParseDataChannelOpenMessage(const rtc::Buffer& payload,
-                                 std::string* label,
-                                 DataChannelInit* config);
-
-bool ParseDataChannelOpenAckMessage(const rtc::Buffer& payload);
-
-bool WriteDataChannelOpenMessage(const std::string& label,
-                                 const DataChannelInit& config,
-                                 rtc::Buffer* payload);
-
-void WriteDataChannelOpenAckMessage(rtc::Buffer* payload);
-}  // namespace webrtc
-
-#endif  // TALK_APP_WEBRTC_SCTPUTILS_H_