zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change return type of SetSendingStatus to be void.

Browse Source 
The eventual implementation of changing the status will be async so the
return value isn't that useful and was in fact only being used to log
a warning if an error occured.

This change is to facilitate upcoming changes related to media engine.

Bug: webrtc:11993
Change-Id: Ia7f85a9ea18b2648b511fa356918cf32a201461f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215975
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33825}
This commit is contained in:
Tomas Gunnarsson
2021-04-23 20:31:08 +02:00
committed by Commit Bot
parent 5ec1d0b25c
commit dbcf5d3918
5 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/rtp_rtcp/source/rtcp_sender.cc
View File

@ -187,8 +187,8 @@ bool RTCPSender::Sending() const {
return sending_; return sending_;
} }
int32_t RTCPSender::SetSendingStatus(const FeedbackState& feedback_state, void RTCPSender::SetSendingStatus(const FeedbackState& feedback_state,
bool sending) { bool sending) {
bool sendRTCPBye = false; bool sendRTCPBye = false;
{ {
MutexLock lock(&mutex_rtcp_sender_); MutexLock lock(&mutex_rtcp_sender_);
@ -201,9 +201,11 @@ int32_t RTCPSender::SetSendingStatus(const FeedbackState& feedback_state,
} }
sending_ = sending; sending_ = sending;
} }
if (sendRTCPBye) if (sendRTCPBye) {
return SendRTCP(feedback_state, kRtcpBye); if (SendRTCP(feedback_state, kRtcpBye) != 0) {
return 0; RTC_LOG(LS_WARNING) << "Failed to send RTCP BYE";
}
}
} }
int32_t RTCPSender::SendLossNotification(const FeedbackState& feedback_state, int32_t RTCPSender::SendLossNotification(const FeedbackState& feedback_state,
@ -213,11 +215,10 @@ int32_t RTCPSender::SendLossNotification(const FeedbackState& feedback_state,
bool buffering_allowed) { bool buffering_allowed) {
int32_t error_code = -1; int32_t error_code = -1;
auto callback = [&](rtc::ArrayView<const uint8_t> packet) { auto callback = [&](rtc::ArrayView<const uint8_t> packet) {
if (transport_->SendRtcp(packet.data(), packet.size())) { transport_->SendRtcp(packet.data(), packet.size());
error_code = 0; error_code = 0;
if (event_log_) { if (event_log_) {
event_log_->Log(std::make_unique<RtcEventRtcpPacketOutgoing>(packet)); event_log_->Log(std::make_unique<RtcEventRtcpPacketOutgoing>(packet));
}
} }
}; };
absl::optional<PacketSender> sender; absl::optional<PacketSender> sender;

4
modules/rtp_rtcp/source/rtcp_sender.h
View File

@ -75,8 +75,8 @@ class RTCPSender final {
void SetRTCPStatus(RtcpMode method) RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_); void SetRTCPStatus(RtcpMode method) RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_);
bool Sending() const RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_); bool Sending() const RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_);
int32_t SetSendingStatus(const FeedbackState& feedback_state, void SetSendingStatus(const FeedbackState& feedback_state,
bool enabled) bool enabled)
RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_); // combine the functions RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_); // combine the functions
int32_t SetNackStatus(bool enable) RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_); int32_t SetNackStatus(bool enable) RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_);

12
modules/rtp_rtcp/source/rtcp_sender_unittest.cc
View File

@ -139,7 +139,7 @@ TEST_F(RtcpSenderTest, SetRtcpStatus) {
TEST_F(RtcpSenderTest, SetSendingStatus) { TEST_F(RtcpSenderTest, SetSendingStatus) {
auto rtcp_sender = CreateRtcpSender(GetDefaultConfig()); auto rtcp_sender = CreateRtcpSender(GetDefaultConfig());
EXPECT_FALSE(rtcp_sender->Sending()); EXPECT_FALSE(rtcp_sender->Sending());
EXPECT_EQ(0, rtcp_sender->SetSendingStatus(feedback_state(), true)); rtcp_sender->SetSendingStatus(feedback_state(), true);
EXPECT_TRUE(rtcp_sender->Sending()); EXPECT_TRUE(rtcp_sender->Sending());
} }
@ -315,8 +315,8 @@ TEST_F(RtcpSenderTest, SendBye) {
TEST_F(RtcpSenderTest, StopSendingTriggersBye) { TEST_F(RtcpSenderTest, StopSendingTriggersBye) {
auto rtcp_sender = CreateRtcpSender(GetDefaultConfig()); auto rtcp_sender = CreateRtcpSender(GetDefaultConfig());
rtcp_sender->SetRTCPStatus(RtcpMode::kReducedSize); rtcp_sender->SetRTCPStatus(RtcpMode::kReducedSize);
EXPECT_EQ(0, rtcp_sender->SetSendingStatus(feedback_state(), true)); rtcp_sender->SetSendingStatus(feedback_state(), true);
EXPECT_EQ(0, rtcp_sender->SetSendingStatus(feedback_state(), false)); rtcp_sender->SetSendingStatus(feedback_state(), false);
EXPECT_EQ(1, parser()->bye()->num_packets()); EXPECT_EQ(1, parser()->bye()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->bye()->sender_ssrc()); EXPECT_EQ(kSenderSsrc, parser()->bye()->sender_ssrc());
} }
@ -513,7 +513,7 @@ TEST_F(RtcpSenderTest, SendXrWithRrtr) {
config.non_sender_rtt_measurement = true; config.non_sender_rtt_measurement = true;
auto rtcp_sender = CreateRtcpSender(config); auto rtcp_sender = CreateRtcpSender(config);
rtcp_sender->SetRTCPStatus(RtcpMode::kCompound); rtcp_sender->SetRTCPStatus(RtcpMode::kCompound);
EXPECT_EQ(0, rtcp_sender->SetSendingStatus(feedback_state(), false)); rtcp_sender->SetSendingStatus(feedback_state(), false);
NtpTime ntp = TimeMicrosToNtp(clock_.TimeInMicroseconds()); NtpTime ntp = TimeMicrosToNtp(clock_.TimeInMicroseconds());
EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpReport)); EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpReport));
EXPECT_EQ(1, parser()->xr()->num_packets()); EXPECT_EQ(1, parser()->xr()->num_packets());
@ -528,7 +528,7 @@ TEST_F(RtcpSenderTest, TestNoXrRrtrSentIfSending) {
config.non_sender_rtt_measurement = true; config.non_sender_rtt_measurement = true;
auto rtcp_sender = CreateRtcpSender(config); auto rtcp_sender = CreateRtcpSender(config);
rtcp_sender->SetRTCPStatus(RtcpMode::kCompound); rtcp_sender->SetRTCPStatus(RtcpMode::kCompound);
EXPECT_EQ(0, rtcp_sender->SetSendingStatus(feedback_state(), true)); rtcp_sender->SetSendingStatus(feedback_state(), true);
EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpReport)); EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpReport));
EXPECT_EQ(0, parser()->xr()->num_packets()); EXPECT_EQ(0, parser()->xr()->num_packets());
} }
@ -538,7 +538,7 @@ TEST_F(RtcpSenderTest, TestNoXrRrtrSentIfNotEnabled) {
config.non_sender_rtt_measurement = false; config.non_sender_rtt_measurement = false;
auto rtcp_sender = CreateRtcpSender(config); auto rtcp_sender = CreateRtcpSender(config);
rtcp_sender->SetRTCPStatus(RtcpMode::kCompound); rtcp_sender->SetRTCPStatus(RtcpMode::kCompound);
EXPECT_EQ(0, rtcp_sender->SetSendingStatus(feedback_state(), false)); rtcp_sender->SetSendingStatus(feedback_state(), false);
EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpReport)); EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpReport));
EXPECT_EQ(0, parser()->xr()->num_packets()); EXPECT_EQ(0, parser()->xr()->num_packets());
} }

4
modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -336,9 +336,7 @@ RTCPSender::FeedbackState ModuleRtpRtcpImpl::GetFeedbackState() {
int32_t ModuleRtpRtcpImpl::SetSendingStatus(const bool sending) { int32_t ModuleRtpRtcpImpl::SetSendingStatus(const bool sending) {
if (rtcp_sender_.Sending() != sending) { if (rtcp_sender_.Sending() != sending) {
// Sends RTCP BYE when going from true to false // Sends RTCP BYE when going from true to false
if (rtcp_sender_.SetSendingStatus(GetFeedbackState(), sending) != 0) { rtcp_sender_.SetSendingStatus(GetFeedbackState(), sending);
RTC_LOG(LS_WARNING) << "Failed to send RTCP BYE";
}
} }
return 0; return 0;
} }

4
modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
View File

@ -286,9 +286,7 @@ RTCPSender::FeedbackState ModuleRtpRtcpImpl2::GetFeedbackState() {
int32_t ModuleRtpRtcpImpl2::SetSendingStatus(const bool sending) { int32_t ModuleRtpRtcpImpl2::SetSendingStatus(const bool sending) {
if (rtcp_sender_.Sending() != sending) { if (rtcp_sender_.Sending() != sending) {
// Sends RTCP BYE when going from true to false // Sends RTCP BYE when going from true to false
if (rtcp_sender_.SetSendingStatus(GetFeedbackState(), sending) != 0) { rtcp_sender_.SetSendingStatus(GetFeedbackState(), sending);
RTC_LOG(LS_WARNING) << "Failed to send RTCP BYE";
}
} }
return 0; return 0;
} }