diff --git a/modules/rtp_rtcp/include/receive_statistics.h b/modules/rtp_rtcp/include/receive_statistics.h index 2046b8228e..65a78a26db 100644 --- a/modules/rtp_rtcp/include/receive_statistics.h +++ b/modules/rtp_rtcp/include/receive_statistics.h @@ -42,8 +42,6 @@ class StreamStatistician { virtual ~StreamStatistician(); virtual bool GetStatistics(RtcpStatistics* statistics, bool reset) = 0; - virtual void GetDataCounters(size_t* bytes_received, - uint32_t* packets_received) const = 0; // Returns average over the stream life time. virtual absl::optional GetFractionLostInPercent() const = 0; diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.cc b/modules/rtp_rtcp/source/receive_statistics_impl.cc index e78cac489f..99566b7e19 100644 --- a/modules/rtp_rtcp/source/receive_statistics_impl.cc +++ b/modules/rtp_rtcp/source/receive_statistics_impl.cc @@ -279,19 +279,6 @@ RtcpStatistics StreamStatisticianImpl::CalculateRtcpStatistics() { return stats; } -void StreamStatisticianImpl::GetDataCounters(size_t* bytes_received, - uint32_t* packets_received) const { - rtc::CritScope cs(&stream_lock_); - if (bytes_received) { - *bytes_received = receive_counters_.transmitted.payload_bytes + - receive_counters_.transmitted.header_bytes + - receive_counters_.transmitted.padding_bytes; - } - if (packets_received) { - *packets_received = receive_counters_.transmitted.packets; - } -} - absl::optional StreamStatisticianImpl::GetFractionLostInPercent() const { rtc::CritScope cs(&stream_lock_); if (received_seq_max_ < 0) { diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.h b/modules/rtp_rtcp/source/receive_statistics_impl.h index a4eab7b6a2..c49fd11979 100644 --- a/modules/rtp_rtcp/source/receive_statistics_impl.h +++ b/modules/rtp_rtcp/source/receive_statistics_impl.h @@ -36,8 +36,6 @@ class StreamStatisticianImpl : public StreamStatistician, // |reset| here and in next method restarts calculation of fraction_lost stat. bool GetStatistics(RtcpStatistics* statistics, bool reset) override; bool GetActiveStatisticsAndReset(RtcpStatistics* statistics); - void GetDataCounters(size_t* bytes_received, - uint32_t* packets_received) const override; absl::optional GetFractionLostInPercent() const override; StreamDataCounters GetReceiveStreamDataCounters() const override; uint32_t BitrateReceived() const override; diff --git a/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/modules/rtp_rtcp/source/receive_statistics_unittest.cc index 25424565bf..8b08ce40da 100644 --- a/modules/rtp_rtcp/source/receive_statistics_unittest.cc +++ b/modules/rtp_rtcp/source/receive_statistics_unittest.cc @@ -96,18 +96,20 @@ TEST_F(ReceiveStatisticsTest, TwoIncomingSsrcs) { receive_statistics_->GetStatistician(kSsrc1); ASSERT_TRUE(statistician != NULL); EXPECT_GT(statistician->BitrateReceived(), 0u); - size_t bytes_received = 0; - uint32_t packets_received = 0; - statistician->GetDataCounters(&bytes_received, &packets_received); - EXPECT_EQ(200u, bytes_received); - EXPECT_EQ(2u, packets_received); + StreamDataCounters counters = statistician->GetReceiveStreamDataCounters(); + EXPECT_EQ(176u, counters.transmitted.payload_bytes); + EXPECT_EQ(24u, counters.transmitted.header_bytes); + EXPECT_EQ(0u, counters.transmitted.padding_bytes); + EXPECT_EQ(2u, counters.transmitted.packets); statistician = receive_statistics_->GetStatistician(kSsrc2); ASSERT_TRUE(statistician != NULL); EXPECT_GT(statistician->BitrateReceived(), 0u); - statistician->GetDataCounters(&bytes_received, &packets_received); - EXPECT_EQ(600u, bytes_received); - EXPECT_EQ(2u, packets_received); + counters = statistician->GetReceiveStreamDataCounters(); + EXPECT_EQ(576u, counters.transmitted.payload_bytes); + EXPECT_EQ(24u, counters.transmitted.header_bytes); + EXPECT_EQ(0u, counters.transmitted.padding_bytes); + EXPECT_EQ(2u, counters.transmitted.packets); EXPECT_EQ(2u, receive_statistics_->RtcpReportBlocks(3).size()); // Add more incoming packets and verify that they are registered in both @@ -117,14 +119,19 @@ TEST_F(ReceiveStatisticsTest, TwoIncomingSsrcs) { receive_statistics_->OnRtpPacket(packet2_); IncrementSequenceNumber(&packet2_); - receive_statistics_->GetStatistician(kSsrc1)->GetDataCounters( - &bytes_received, &packets_received); - EXPECT_EQ(300u, bytes_received); - EXPECT_EQ(3u, packets_received); - receive_statistics_->GetStatistician(kSsrc2)->GetDataCounters( - &bytes_received, &packets_received); - EXPECT_EQ(900u, bytes_received); - EXPECT_EQ(3u, packets_received); + counters = receive_statistics_->GetStatistician(kSsrc1) + ->GetReceiveStreamDataCounters(); + EXPECT_EQ(264u, counters.transmitted.payload_bytes); + EXPECT_EQ(36u, counters.transmitted.header_bytes); + EXPECT_EQ(0u, counters.transmitted.padding_bytes); + EXPECT_EQ(3u, counters.transmitted.packets); + + counters = receive_statistics_->GetStatistician(kSsrc2) + ->GetReceiveStreamDataCounters(); + EXPECT_EQ(864u, counters.transmitted.payload_bytes); + EXPECT_EQ(36u, counters.transmitted.header_bytes); + EXPECT_EQ(0u, counters.transmitted.padding_bytes); + EXPECT_EQ(3u, counters.transmitted.packets); } TEST_F(ReceiveStatisticsTest, @@ -193,11 +200,11 @@ TEST_F(ReceiveStatisticsTest, ActiveStatisticians) { StreamStatistician* statistician = receive_statistics_->GetStatistician(kSsrc1); ASSERT_TRUE(statistician != NULL); - size_t bytes_received = 0; - uint32_t packets_received = 0; - statistician->GetDataCounters(&bytes_received, &packets_received); - EXPECT_EQ(200u, bytes_received); - EXPECT_EQ(2u, packets_received); + StreamDataCounters counters = statistician->GetReceiveStreamDataCounters(); + EXPECT_EQ(176u, counters.transmitted.payload_bytes); + EXPECT_EQ(24u, counters.transmitted.header_bytes); + EXPECT_EQ(0u, counters.transmitted.padding_bytes); + EXPECT_EQ(2u, counters.transmitted.packets); } TEST_F(ReceiveStatisticsTest,