Michael Froman
c0c9a0cd01
Upstream commit: https://webrtc.googlesource.com/src/+/3901cac157827a74e6edf140303ea2260519c7bc Stash PacketBuffer::Packet instead of recreating it during unstash To reduce cost of re-trying and re-parsing the same packet multiple times. Bug: b/510362066 Change-Id: Ic1ffe2c2e6466d0c028a9d4dff9b6c656787633e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/496061 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Åsa Persson <asapersson@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48366}
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 36726ed9fc..c8e7300453 100644
|
|
--- a/call/video_receive_stream.h
|
|
+++ b/call/video_receive_stream.h
|
|
@@ -247,6 +247,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 e08224d6b5..7dd263a5d6 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -1427,7 +1427,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;
|
|
}
|