mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-23 12:51:06 +00:00
421167ce85
We already cherry-picked this when we vendored 7fff587a09. Upstream commit: https://webrtc.googlesource.com/src/+/e94c7da1df402ab0193fe5bf010646c7eb08b629 Revert "Return audio stats regarless if we have a codec." This reverts commit 7fff587a096c6ef40f5601f47ef50b221b3a4abf. Reason for revert: breaks downstream test Original change's description: > Return audio stats regarless if we have a codec. > > Bug: b/331602608 > Change-Id: I2d12a3ed83645fe1e7cbd8950fd86d5ba2d7c94d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361743 > Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org> > Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#42964} Bug: b/331602608 Change-Id: Ia87ef3b3066e1373654e1f0d96726217e7ed4117 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361761 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Auto-Submit: Jakob Ivarsson <jakobi@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#42965}
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 f69b03a166..f68368567c 100644
|
|
--- a/call/video_receive_stream.h
|
|
+++ b/call/video_receive_stream.h
|
|
@@ -236,6 +236,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 d6c859f535..23c3d3f6eb 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -1244,7 +1244,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;
|
|
}
|