Replace SetCapturer and SetCaptureDevice by SetSource.

webrtc/pc/channel.h

 /*
  *  Copyright 2004 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.
  */
 
 #ifndef TALK_SESSION_MEDIA_CHANNEL_H_
 #define TALK_SESSION_MEDIA_CHANNEL_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "webrtc/audio_sink.h"
 #include "webrtc/base/asyncudpsocket.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/network.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/window.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/mediaengine.h"
 #include "webrtc/media/base/streamparams.h"
-#include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/media/base/videosourceinterface.h"
 #include "webrtc/p2p/base/transportcontroller.h"
 #include "webrtc/p2p/client/socketmonitor.h"
 #include "webrtc/pc/audiomonitor.h"
 #include "webrtc/pc/bundlefilter.h"
 #include "webrtc/pc/mediamonitor.h"
 #include "webrtc/pc/mediasession.h"
 #include "webrtc/pc/rtcpmuxfilter.h"
 #include "webrtc/pc/srtpfilter.h"
 
 namespace webrtc {
@@ skipping 396 matching lines @@
   virtual VideoMediaChannel* media_channel() const {
     return static_cast<VideoMediaChannel*>(BaseChannel::media_channel());
   }
 
   bool SetSink(uint32_t ssrc, rtc::VideoSinkInterface<VideoFrame>* sink);
 
   // TODO(pthatcher): Refactor to use a "capture id" instead of an
   // ssrc here as the "key".
   // Passes ownership of the capturer to the channel.
   bool AddScreencast(uint32_t ssrc, VideoCapturer* capturer);
-  bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer);
+  // Register a source. The |ssrc| must correspond to a registered
+  // send stream.

[pthatcher1, 2016/03/05 01:45:41]

We should specify what happens if it isn't (ie nothing, except a debug build
will explode)

[nisse-webrtc, 2016/03/15 16:28:00]

The current implementation will always explode, except if source is NULL. I
don't quite like the exception, but it seemed hard to avoid (I think I described
the problem a week or two ago).

And do we really need to document in which way things break in case a caller
violates the documented interface?

+  void SetSource(uint32_t ssrc,
+                 rtc::VideoSourceInterface<cricket::VideoFrame>* source);
   bool RemoveScreencast(uint32_t ssrc);
   // True if we've added a screencast.  Doesn't matter if the capturer
   // has been started or not.
   bool IsScreencasting();
   // Get statistics about the current media session.
   bool GetStats(VideoMediaInfo* stats);
 
   sigslot::signal2<VideoChannel*, const std::vector<ConnectionInfo>&>
       SignalConnectionMonitor;
 
@@ skipping 162 matching lines @@
   // SetSendParameters.
   DataSendParameters last_send_params_;
   // Last DataRecvParameters sent down to the media_channel() via
   // SetRecvParameters.
   DataRecvParameters last_recv_params_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_CHANNEL_H_