From c219a53c80baf24c5a8cfe6c63bd7d7edfae764f Mon Sep 17 00:00:00 2001 From: Jonathan Lennox Date: Tue, 13 Jul 2021 15:49:13 -0400 Subject: [PATCH] Don't try to send REMB or VideoBitrateAllocation when RTCP is off. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:12978 Change-Id: I0bd9cb239c9d74695c1408dde985c92b2834ba2d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/225961 Reviewed-by: Erik Språng Commit-Queue: Philipp Hancke Cr-Commit-Position: refs/heads/master@{#34610} --- modules/rtp_rtcp/source/rtcp_sender.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc index 7f5e327de1..b6f44e5550 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/modules/rtp_rtcp/source/rtcp_sender.cc @@ -282,6 +282,10 @@ int32_t RTCPSender::SendLossNotification(const FeedbackState& feedback_state, void RTCPSender::SetRemb(int64_t bitrate_bps, std::vector ssrcs) { RTC_CHECK_GE(bitrate_bps, 0); MutexLock lock(&mutex_rtcp_sender_); + if (method_ == RtcpMode::kOff) { + RTC_LOG(LS_WARNING) << "Can't send rtcp if it is disabled."; + return; + } remb_bitrate_ = bitrate_bps; remb_ssrcs_ = std::move(ssrcs); @@ -887,6 +891,10 @@ bool RTCPSender::AllVolatileFlagsConsumed() const { void RTCPSender::SetVideoBitrateAllocation( const VideoBitrateAllocation& bitrate) { MutexLock lock(&mutex_rtcp_sender_); + if (method_ == RtcpMode::kOff) { + RTC_LOG(LS_WARNING) << "Can't send rtcp if it is disabled."; + return; + } // Check if this allocation is first ever, or has a different set of // spatial/temporal layers signaled and enabled, if so trigger an rtcp report // as soon as possible.