06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
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 7cb3c9bf02..1b7d28cf50 100644
|
|
--- a/call/video_receive_stream.h
|
|
+++ b/call/video_receive_stream.h
|
|
@@ -239,6 +239,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 dccae6e568..6adcd91c3a 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -1331,7 +1331,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;
|
|
}
|