diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h index 70b073cd79..b2a6cbf687 100644 --- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h @@ -150,7 +150,6 @@ class MockRtpRtcpInterface : public RtpRtcpInterface { (), (const, override)); MOCK_METHOD(void, SetRtcpXrRrtrStatus, (bool enable), (override)); - MOCK_METHOD(bool, RtcpXrRrtrStatus, (), (const, override)); MOCK_METHOD(void, SetRemb, (int64_t bitrate, std::vector ssrcs), @@ -168,7 +167,6 @@ class MockRtpRtcpInterface : public RtpRtcpInterface { SetStorePacketsStatus, (bool enable, uint16_t number_to_store), (override)); - MOCK_METHOD(bool, StorePackets, (), (const, override)); MOCK_METHOD(void, SendCombinedRtcpPacket, (std::vector> rtcp_packets), diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 7f7df174fd..8243076e1c 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -238,8 +238,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { // requests. void SetStorePacketsStatus(bool enable, uint16_t number_to_store) override; - bool StorePackets() const override; - void SendCombinedRtcpPacket( std::vector> rtcp_packets) override; @@ -252,8 +250,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { // (XR) Receiver reference time report. void SetRtcpXrRrtrStatus(bool enable) override; - bool RtcpXrRrtrStatus() const override; - // Video part. int32_t SendLossNotification(uint16_t last_decoded_seq_num, uint16_t last_received_seq_num, @@ -326,6 +322,12 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { bool TimeToSendFullNackList(int64_t now) const; + // Returns true if the module is configured to store packets. + bool StorePackets() const; + + // Returns current Receiver Reference Time Report (RTTR) status. + bool RtcpXrRrtrStatus() const; + std::unique_ptr rtp_sender_; RTCPSender rtcp_sender_; diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h index d93e72b286..512dfa08ce 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h @@ -231,16 +231,12 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface, // requests. void SetStorePacketsStatus(bool enable, uint16_t number_to_store) override; - bool StorePackets() const override; - void SendCombinedRtcpPacket( std::vector> rtcp_packets) override; // (XR) Receiver reference time report. void SetRtcpXrRrtrStatus(bool enable) override; - bool RtcpXrRrtrStatus() const override; - // Video part. int32_t SendLossNotification(uint16_t last_decoded_seq_num, uint16_t last_received_seq_num, @@ -292,6 +288,12 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface, // check if we need to send RTCP report, send TMMBR updates and fire events. void PeriodicUpdate(); + // Returns true if the module is configured to store packets. + bool StorePackets() const; + + // Returns current Receiver Reference Time Report (RTTR) status. + bool RtcpXrRrtrStatus() const; + TaskQueueBase* const worker_queue_; RTC_NO_UNIQUE_ADDRESS SequenceChecker process_thread_checker_; diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc index 9925c541c3..fefc853919 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc @@ -320,12 +320,6 @@ TEST_F(RtpRtcpImpl2Test, Rtt) { EXPECT_NEAR(2 * kOneWayNetworkDelayMs, sender_.impl_->rtt_ms(), 1); } -TEST_F(RtpRtcpImpl2Test, SetRtcpXrRrtrStatus) { - EXPECT_FALSE(receiver_.impl_->RtcpXrRrtrStatus()); - receiver_.impl_->SetRtcpXrRrtrStatus(true); - EXPECT_TRUE(receiver_.impl_->RtcpXrRrtrStatus()); -} - TEST_F(RtpRtcpImpl2Test, RttForReceiverOnly) { receiver_.impl_->SetRtcpXrRrtrStatus(true); diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc index 826e4cb340..f89a097cc0 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc @@ -308,12 +308,6 @@ TEST_F(RtpRtcpImplTest, Rtt) { EXPECT_NEAR(2 * kOneWayNetworkDelayMs, sender_.impl_->rtt_ms(), 1); } -TEST_F(RtpRtcpImplTest, SetRtcpXrRrtrStatus) { - EXPECT_FALSE(receiver_.impl_->RtcpXrRrtrStatus()); - receiver_.impl_->SetRtcpXrRrtrStatus(true); - EXPECT_TRUE(receiver_.impl_->RtcpXrRrtrStatus()); -} - TEST_F(RtpRtcpImplTest, RttForReceiverOnly) { receiver_.impl_->SetRtcpXrRrtrStatus(true); diff --git a/modules/rtp_rtcp/source/rtp_rtcp_interface.h b/modules/rtp_rtcp/source/rtp_rtcp_interface.h index 3bd5d47053..accf50c896 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_interface.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_interface.h @@ -372,9 +372,6 @@ class RtpRtcpInterface : public RtcpFeedbackSenderInterface { // (XR) Sets Receiver Reference Time Report (RTTR) status. virtual void SetRtcpXrRrtrStatus(bool enable) = 0; - // Returns current Receiver Reference Time Report (RTTR) status. - virtual bool RtcpXrRrtrStatus() const = 0; - // (REMB) Receiver Estimated Max Bitrate. // Schedules sending REMB on next and following sender/receiver reports. void SetRemb(int64_t bitrate_bps, std::vector ssrcs) override = 0; @@ -399,9 +396,6 @@ class RtpRtcpInterface : public RtcpFeedbackSenderInterface { // requests. virtual void SetStorePacketsStatus(bool enable, uint16_t numberToStore) = 0; - // Returns true if the module is configured to store packets. - virtual bool StorePackets() const = 0; - virtual void SetVideoBitrateAllocation( const VideoBitrateAllocation& bitrate) = 0;