webrtc/api/webrtcsession.h - Issue 1766653002: Replace SetCapturer and SetCaptureDevice by SetSource.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/webrtcsession.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/api/webrtcsession.h

diff --git a/webrtc/api/webrtcsession.h b/webrtc/api/webrtcsession.h

index 70265d30434e012369a508bf0e847553bb17dd07..b6ecc777d3415296e02a13b1b2104eae83e2bb59 100644

--- a/webrtc/api/webrtcsession.h

+++ b/webrtc/api/webrtcsession.h

@@ -33,7 +33,6 @@ namespace cricket {

class ChannelManager;

class DataChannel;

class StatsReport;

-class VideoCapturer;

class VideoChannel;

class VoiceChannel;

@@ -240,7 +239,9 @@ class WebRtcSession : public AudioProviderInterface,

rtc::scoped_ptr<AudioSinkInterface> sink) override;

// Implements VideoMediaProviderInterface.

- bool SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) override;

+ bool SetSource(

+ uint32_t ssrc,

+ rtc::VideoSourceInterface<cricket::VideoFrame>* source) override;

void SetVideoPlayout(

uint32_t ssrc,

bool enable,

« no previous file with comments | « webrtc/api/rtpsenderreceiver_unittest.cc ('k') | webrtc/api/webrtcsession.cc » ('j') | webrtc/media/engine/webrtcvideoengine2.cc » ('J')