Nico Grunbaum
5ddced1f31
Upstream commit: https://webrtc.googlesource.com/src/+/c1612b421bc3784e831224de78f36ffd0d0f2d71 Configure RTCP mode during RTP/RTCP module construction Pass the RTCP mode and remote SSRC directly (for receive) to the configuration and constructors of the RTP/RTCP modules, rather than relying on post-construction setters. Bug: webrtc:42222117 Change-Id: I7235a0089ca71f249dba6d79bad8901e0466ff0c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/471680 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47688}
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Fri, 19 Feb 2021 13:45:00 +0100
|
|
Subject: Bug 1654112 - libwebrtc: Add a REMB on/off switch to
|
|
VideoReceiveStream. r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D105774
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/7330681cf4de6d8dd868cc661cbdd6679bbc07b3
|
|
---
|
|
call/video_receive_stream.h | 3 +++
|
|
video/rtp_video_stream_receiver2.cc | 2 +-
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h
|
|
index ce8bcc6b84..84a3059c40 100644
|
|
--- a/call/video_receive_stream.h
|
|
+++ b/call/video_receive_stream.h
|
|
@@ -241,6 +241,9 @@ class VideoReceiveStreamInterface : public MediaReceiveStreamInterface {
|
|
// disabled.
|
|
KeyFrameReqMethod keyframe_method = KeyFrameReqMethod::kPliRtcp;
|
|
|
|
+ // See draft-alvestrand-rmcat-remb for information.
|
|
+ bool remb = false;
|
|
+
|
|
bool tmmbr = false;
|
|
|
|
// See LntfConfig for description.
|
|
diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc
|
|
index fc176dcf04..201c486fb9 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -1372,7 +1372,7 @@ void RtpVideoStreamReceiver2::StartReceive() {
|
|
// Change REMB candidate egibility.
|
|
packet_router_->RemoveReceiveRtpModule(rtp_rtcp_.get());
|
|
packet_router_->AddReceiveRtpModule(rtp_rtcp_.get(),
|
|
- /*remb_candidate=*/true);
|
|
+ /*remb_candidate=*/config_.rtp.remb);
|
|
}
|
|
receiving_ = true;
|
|
}
|