From f6777a4997bf46301602789aad3d94be56b39fca Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Tue, 6 Dec 2022 10:08:21 +0000 Subject: [PATCH] Delete unused rtp_rtcp method "SetCsrcs" The CSRC concept is really a frame level concept. Setting it per sender is a quick hack, and should be minimized. This function doesn't seem to be used anywhere, so removing it lessens the chance of confusion. Bug: webrtc:7135 Change-Id: Ia3c27b5984b153e68bc51d93b03f08f7f867adc0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/286426 Commit-Queue: Harald Alvestrand Reviewed-by: Tony Herre Cr-Commit-Position: refs/heads/main@{#38822} --- modules/rtp_rtcp/mocks/mock_rtp_rtcp.h | 1 - modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 5 ----- modules/rtp_rtcp/source/rtp_rtcp_impl.h | 2 -- modules/rtp_rtcp/source/rtp_rtcp_impl2.cc | 5 ----- modules/rtp_rtcp/source/rtp_rtcp_impl2.h | 2 -- modules/rtp_rtcp/source/rtp_rtcp_interface.h | 4 ---- 6 files changed, 19 deletions(-) diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h index 5c93e0bfed..75c30742df 100644 --- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h @@ -67,7 +67,6 @@ class MockRtpRtcpInterface : public RtpRtcpInterface { MOCK_METHOD(RtpState, GetRtxState, (), (const, override)); MOCK_METHOD(uint32_t, SSRC, (), (const, override)); MOCK_METHOD(void, SetMid, (absl::string_view mid), (override)); - MOCK_METHOD(void, SetCsrcs, (const std::vector& csrcs), (override)); MOCK_METHOD(void, SetRtxSendStatus, (int modes), (override)); MOCK_METHOD(int, RtxSendStatus, (), (const, override)); MOCK_METHOD(absl::optional, RtxSsrc, (), (const, override)); diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index a3662f19d9..eac023df3d 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -265,11 +265,6 @@ void ModuleRtpRtcpImpl::SetMid(absl::string_view mid) { // RTCP, this will need to be passed down to the RTCPSender also. } -void ModuleRtpRtcpImpl::SetCsrcs(const std::vector& csrcs) { - rtcp_sender_.SetCsrcs(csrcs); - rtp_sender_->packet_generator.SetCsrcs(csrcs); -} - // TODO(pbos): Handle media and RTX streams separately (separate RTCP // feedbacks). RTCPSender::FeedbackState ModuleRtpRtcpImpl::GetFeedbackState() { diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index cbe30dddf5..f164195168 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -103,8 +103,6 @@ class ABSL_DEPRECATED("") ModuleRtpRtcpImpl void SetMid(absl::string_view mid) override; - void SetCsrcs(const std::vector& csrcs) override; - RTCPSender::FeedbackState GetFeedbackState(); void SetRtxSendStatus(int mode) override; diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc index ecc05ca9d0..31dd1499d5 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc @@ -230,11 +230,6 @@ void ModuleRtpRtcpImpl2::SetMid(absl::string_view mid) { // RTCP, this will need to be passed down to the RTCPSender also. } -void ModuleRtpRtcpImpl2::SetCsrcs(const std::vector& csrcs) { - rtcp_sender_.SetCsrcs(csrcs); - rtp_sender_->packet_generator.SetCsrcs(csrcs); -} - // TODO(pbos): Handle media and RTX streams separately (separate RTCP // feedbacks). RTCPSender::FeedbackState ModuleRtpRtcpImpl2::GetFeedbackState() { diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h index 34b6b8342d..e7a3ac03e8 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h @@ -114,8 +114,6 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface, void SetMid(absl::string_view mid) override; - void SetCsrcs(const std::vector& csrcs) override; - RTCPSender::FeedbackState GetFeedbackState(); void SetRtxSendStatus(int mode) override; diff --git a/modules/rtp_rtcp/source/rtp_rtcp_interface.h b/modules/rtp_rtcp/source/rtp_rtcp_interface.h index 8b1d11aa45..2024b308dd 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_interface.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_interface.h @@ -258,10 +258,6 @@ class RtpRtcpInterface : public RtcpFeedbackSenderInterface { // Once set, this value can not be changed or removed. virtual void SetMid(absl::string_view mid) = 0; - // Sets CSRC. - // `csrcs` - vector of CSRCs - virtual void SetCsrcs(const std::vector& csrcs) = 0; - // Turns on/off sending RTX (RFC 4588). The modes can be set as a combination // of values of the enumerator RtxMode. virtual void SetRtxSendStatus(int modes) = 0;