Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: webrtc/pc/channel.h

Issue 1766653002: Replace SetCapturer and SetCaptureDevice by SetSource. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Make SetSource tolerate unknown ssrc and source == NULL. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index f72818924d598b062280e858711e05ea8c702add..59e166f87b33a713d6599e2f118d9ad38933717f 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -26,8 +26,8 @@
#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"
@@ -444,7 +444,10 @@ class VideoChannel : public BaseChannel {
// 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 not
nisse-webrtc 2016/03/15 16:28:00 The current implementation will always explode, ex
+ 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.

Powered by Google App Engine
This is Rietveld 408576698