admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused method ModuleRtpRtcpImpl::SendCompoundRTCP

Browse Source 
The corresponding method on RTCPSender is unchanged.

Bug: None
Change-Id: I5a36e5e9f1afe97084928bb2257b81014da04e18
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/138071
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28033}
This commit is contained in:
Niels Möller 2019-05-23 10:44:35 +02:00 committed by Commit Bot
parent 2799e63bfb
commit 39ece6d315
4 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/rtp_rtcp/include/rtp_rtcp.h
View File

@ -331,12 +331,6 @@ class RtpRtcp : public Module, public RtcpFeedbackSenderInterface {
// Returns -1 on failure else 0.
virtual int32_t SendRTCP(RTCPPacketType rtcp_packet_type) = 0;
// Forces a send of a RTCP packet with more than one packet type.
// periodic SR and RR are triggered via the process function
// Returns -1 on failure else 0.
virtual int32_t SendCompoundRTCP(
const std::set<RTCPPacketType>& rtcp_packet_types) = 0;
// Returns statistics of the amount of data sent.
// Returns -1 on failure else 0.
virtual int32_t DataCountersRTP(size_t* bytes_sent,

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

@ -511,13 +511,6 @@ int32_t ModuleRtpRtcpImpl::SendRTCP(RTCPPacketType packet_type) {
return rtcp_sender_.SendRTCP(GetFeedbackState(), packet_type);
}
// Force a send of an RTCP packet.
// Normal SR and RR are triggered via the process function.
int32_t ModuleRtpRtcpImpl::SendCompoundRTCP(
const std::set<RTCPPacketType>& packet_types) {
return rtcp_sender_.SendCompoundRTCP(GetFeedbackState(), packet_types);
}
int32_t ModuleRtpRtcpImpl::SetRTCPApplicationSpecificData(
const uint8_t sub_type,
const uint32_t name,

3
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -184,9 +184,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
// Normal SR and RR are triggered via the process function.
int32_t SendRTCP(RTCPPacketType rtcpPacketType) override;
int32_t SendCompoundRTCP(
const std::set<RTCPPacketType>& rtcpPacketTypes) override;
// Statistics of the amount of data sent and received.
int32_t DataCountersRTP(size_t* bytes_sent,
uint32_t* packets_sent) const override;

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

@ -386,27 +386,6 @@ TEST_F(RtpRtcpImplTest, RtcpPacketTypeCounter_Nack) {
EXPECT_GT(sender_.RtcpReceived().first_packet_time_ms, -1);
}
TEST_F(RtpRtcpImplTest, RtcpPacketTypeCounter_FirAndPli) {
EXPECT_EQ(0U, sender_.RtcpReceived().fir_packets);
EXPECT_EQ(0U, receiver_.RtcpSent().fir_packets);
// Receive module sends a FIR.
EXPECT_EQ(0, receiver_.impl_->SendRTCP(kRtcpFir));
EXPECT_EQ(1U, receiver_.RtcpSent().fir_packets);
// Send module receives the FIR.
EXPECT_EQ(1U, sender_.RtcpReceived().fir_packets);
// Receive module sends a FIR and PLI.
std::set<RTCPPacketType> packet_types;
packet_types.insert(kRtcpFir);
packet_types.insert(kRtcpPli);
EXPECT_EQ(0, receiver_.impl_->SendCompoundRTCP(packet_types));
EXPECT_EQ(2U, receiver_.RtcpSent().fir_packets);
EXPECT_EQ(1U, receiver_.RtcpSent().pli_packets);
// Send module receives the FIR and PLI.
EXPECT_EQ(2U, sender_.RtcpReceived().fir_packets);
EXPECT_EQ(1U, sender_.RtcpReceived().pli_packets);
}
TEST_F(RtpRtcpImplTest, AddStreamDataCounters) {
StreamDataCounters rtp;
const int64_t kStartTimeMs = 1;