From b6220d9470729ab96aae3e787bc095613c379a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 29 Aug 2019 13:47:09 +0200 Subject: [PATCH] Delete unused logic for audio RtcpMode::kOff Bug: None Change-Id: I740764818c5e6ea04a909c848c04531889c6ef96 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150791 Reviewed-by: Oskar Sundbom Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#29023} --- audio/channel_receive.cc | 11 +---------- audio/channel_send.cc | 9 --------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc index 20cd0dba23..2df6a5c572 100644 --- a/audio/channel_receive.cc +++ b/audio/channel_receive.cc @@ -516,12 +516,7 @@ ChannelReceive::ChannelReceive( _moduleProcessThreadPtr->RegisterModule(_rtpRtcpModule.get(), RTC_FROM_HERE); - // Ensure that RTCP is enabled by default for the created channel. - // Note that, the module will keep generating RTCP until it is explicitly - // disabled by the user. - // After StopListen (when no sockets exists), RTCP packets will no longer - // be transmitted since the Transport object will then be invalid. - // RTCP is enabled by default. + // Ensure that RTCP is enabled for the created channel. _rtpRtcpModule->SetRTCPStatus(RtcpMode::kCompound); if (media_transport()) { @@ -907,10 +902,6 @@ int64_t ChannelReceive::GetRTT() const { return 0; } - RtcpMode method = _rtpRtcpModule->RTCP(); - if (method == RtcpMode::kOff) { - return 0; - } std::vector report_blocks; _rtpRtcpModule->RemoteRTCPStat(&report_blocks); diff --git a/audio/channel_send.cc b/audio/channel_send.cc index 212ef706f3..982d932e54 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -679,11 +679,6 @@ ChannelSend::ChannelSend(Clock* clock, _moduleProcessThreadPtr->RegisterModule(_rtpRtcpModule.get(), RTC_FROM_HERE); // Ensure that RTCP is enabled by default for the created channel. - // Note that, the module will keep generating RTCP until it is explicitly - // disabled by the user. - // After StopListen (when no sockets exists), RTCP packets will no longer - // be transmitted since the Transport object will then be invalid. - // RTCP is enabled by default. _rtpRtcpModule->SetRTCPStatus(RtcpMode::kCompound); int error = audio_coding_->RegisterTransportCallback(this); @@ -1150,10 +1145,6 @@ int64_t ChannelSend::GetRTT() const { return 0; } - RtcpMode method = _rtpRtcpModule->RTCP(); - if (method == RtcpMode::kOff) { - return 0; - } std::vector report_blocks; _rtpRtcpModule->RemoteRTCPStat(&report_blocks);