webrtc/media/engine/webrtcvideoengine2.h - Issue 1713493003: Enabling rtcp-rsize negotiation and fixing some issues with it.

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/media/engine/webrtcvideoengine2.h

Issue 1713493003: Enabling rtcp-rsize negotiation and fixing some issues with it. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fixing unit test and adding more TODOs. Created 4 years, 9 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/media/engine/webrtcvideoengine2.h

diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h

index 850bcaef63e161542e7b7267a302e8638d8fe9dd..7ffd85343bf5c5fa4c5148b8ea949ce78bb52cf1 100644

--- a/webrtc/media/engine/webrtcvideoengine2.h

+++ b/webrtc/media/engine/webrtcvideoengine2.h

@@ -200,7 +200,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {

// These optionals are unset if not changed.

rtc::Optional<std::vector<VideoCodecSettings>> codec_settings;

rtc::Optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions;

- rtc::Optional<webrtc::RtcpMode> rtcp_mode;

};

bool GetChangedSendParameters(const VideoSendParameters& params,

@@ -411,9 +410,11 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {

const std::vector<uint32_t>& GetSsrcs() const;

void SetLocalSsrc(uint32_t local_ssrc);

+ // TODO(deadbeef): Move these feedback parameters into the recv parameters.

void SetFeedbackParameters(bool nack_enabled,

bool remb_enabled,

- bool transport_cc_enabled);

+ bool transport_cc_enabled,

+ webrtc::RtcpMode rtcp_mode);

void SetRecvParameters(const ChangedRecvParameters& recv_params);

void RenderFrame(const webrtc::VideoFrame& frame,

« no previous file with comments | « webrtc/media/base/mediachannel.h ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »