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

Delete internal getter methods from RtpRtcpInterface

Browse Source 
Methods deleted: StorePackets, RtcpXrRrtrStatus. They are now private
methods on the two implementations.

Bug: None
Change-Id: If68e8f1e8ba233302e24e0cdb6bf7c1b0c9f330f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194322
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32670}
This commit is contained in:
Niels Möller
2020-11-20 12:21:21 +01:00
committed by Commit Bot
parent a28ae40ce2
commit af6ea0c3ab
6 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
View File

@ -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<uint32_t> 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<std::unique_ptr<rtcp::RtcpPacket>> rtcp_packets),

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

@ -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<std::unique_ptr<rtcp::RtcpPacket>> 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<RtpSenderContext> rtp_sender_;
RTCPSender rtcp_sender_;

10
modules/rtp_rtcp/source/rtp_rtcp_impl2.h
View File

@ -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<std::unique_ptr<rtcp::RtcpPacket>> 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_;

6
modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc
View File

@ -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);

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

@ -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);

6
modules/rtp_rtcp/source/rtp_rtcp_interface.h
View File

@ -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<uint32_t> 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;