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

Delete RtpRtcpInterface::SetRid.

Browse Source 
This setter method is replaced by a construction-time config setting.

Bug: None
Change-Id: I1a685e9b4065762b30698231c7f4d9c567459e29
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264446
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37148}
This commit is contained in:
Niels Möller 2022-05-31 16:17:21 +02:00 committed by WebRTC LUCI CQ
parent 67f0d6d677
commit bc6101459f
8 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,6 @@ class MockRtpRtcpInterface : public RtpRtcpInterface {
MOCK_METHOD(RtpState, GetRtpState, (), (const, override));
MOCK_METHOD(RtpState, GetRtxState, (), (const, override));
MOCK_METHOD(uint32_t, SSRC, (), (const, override));
MOCK_METHOD(void, SetRid, (absl::string_view rid), (override));
MOCK_METHOD(void, SetMid, (absl::string_view mid), (override));
MOCK_METHOD(void, SetCsrcs, (const std::vector<uint32_t>& csrcs), (override));
MOCK_METHOD(void, SetRtxSendStatus, (int modes), (override));

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

@ -292,12 +292,6 @@ RtpState ModuleRtpRtcpImpl::GetRtxState() const {
return state;
}
void ModuleRtpRtcpImpl::SetRid(absl::string_view rid) {
if (rtp_sender_) {
rtp_sender_->packet_generator.SetRid(rid);
}
}
void ModuleRtpRtcpImpl::SetMid(absl::string_view mid) {
if (rtp_sender_) {
rtp_sender_->packet_generator.SetMid(mid);

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

@ -102,8 +102,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
uint32_t SSRC() const override { return rtcp_sender_.SSRC(); }
void SetRid(absl::string_view rid) override;
void SetMid(absl::string_view mid) override;
void SetCsrcs(const std::vector<uint32_t>& csrcs) override;

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

@ -228,12 +228,6 @@ uint32_t ModuleRtpRtcpImpl2::local_media_ssrc() const {
return rtcp_receiver_.local_media_ssrc();
}
void ModuleRtpRtcpImpl2::SetRid(absl::string_view rid) {
if (rtp_sender_) {
rtp_sender_->packet_generator.SetRid(rid);
}
}
void ModuleRtpRtcpImpl2::SetMid(absl::string_view mid) {
if (rtp_sender_) {
rtp_sender_->packet_generator.SetMid(mid);

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

@ -114,8 +114,6 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface,
// RtpRtcpInterface::Configuration::local_media_ssrc.
uint32_t local_media_ssrc() const;
void SetRid(absl::string_view rid) override;
void SetMid(absl::string_view mid) override;
void SetCsrcs(const std::vector<uint32_t>& csrcs) override;

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

@ -258,13 +258,6 @@ class RtpRtcpInterface : public RtcpFeedbackSenderInterface {
// Returns SSRC.
virtual uint32_t SSRC() const = 0;
// Sets the value for sending in the RID (and Repaired) RTP header extension.
// RIDs are used to identify an RTP stream if SSRCs are not negotiated.
// If the RID and Repaired RID extensions are not registered, the RID will
// not be sent.
[[deprecated("Use the rid member of config struct instead'")]] virtual void
SetRid(absl::string_view rid) = 0;
// Sets the value for sending in the MID RTP header extension.
// The MID RTP header extension should be registered for this to do anything.
// Once set, this value can not be changed or removed.

8
modules/rtp_rtcp/source/rtp_sender.cc
View File

@ -587,14 +587,6 @@ uint32_t RTPSender::TimestampOffset() const {
return timestamp_offset_;
}
void RTPSender::SetRid(absl::string_view rid) {
// RID is used in simulcast scenario when multiple layers share the same mid.
MutexLock lock(&send_mutex_);
RTC_DCHECK_LE(rid.length(), RtpStreamId::kMaxValueSizeBytes);
rid_ = std::string(rid);
UpdateHeaderSizes();
}
void RTPSender::SetMid(absl::string_view mid) {
// This is configured via the API.
MutexLock lock(&send_mutex_);

4
modules/rtp_rtcp/source/rtp_sender.h
View File

@ -58,8 +58,6 @@ class RTPSender {
uint32_t TimestampOffset() const RTC_LOCKS_EXCLUDED(send_mutex_);
void SetTimestampOffset(uint32_t timestamp) RTC_LOCKS_EXCLUDED(send_mutex_);
void SetRid(absl::string_view rid) RTC_LOCKS_EXCLUDED(send_mutex_);
void SetMid(absl::string_view mid) RTC_LOCKS_EXCLUDED(send_mutex_);
uint16_t SequenceNumber() const RTC_LOCKS_EXCLUDED(send_mutex_);
@ -196,7 +194,7 @@ class RTPSender {
// RTP variables
uint32_t timestamp_offset_ RTC_GUARDED_BY(send_mutex_);
// RID value to send in the RID or RepairedRID header extension.
std::string rid_ RTC_GUARDED_BY(send_mutex_);
const std::string rid_;
// MID value to send in the MID header extension.
std::string mid_ RTC_GUARDED_BY(send_mutex_);
// Should we send MID/RID even when ACKed? (see below).