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

Delete deprecated RTPSender::SetCsrcs

Browse Source 
Bug: None
Change-Id: I0ce16dc51fa8aa9dcb1f3e96e62f05be11e3cba2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/315941
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40566}
This commit is contained in:
Danil Chapovalov 2023-08-15 13:32:54 +02:00 committed by WebRTC LUCI CQ
parent 68dafcb6c1
commit 31251fa817
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,6 @@ RTPSender::RTPSender(const RtpRtcpInterface::Configuration& config,
always_send_mid_and_rid_(config.always_send_mid_and_rid),
ssrc_has_acked_(false),
rtx_ssrc_has_acked_(false),
csrcs_(),
rtx_(kRtxOff),
supports_bwe_extension_(false),
retransmission_rate_limiter_(config.retransmission_rate_limiter) {
@ -507,13 +506,6 @@ size_t RTPSender::ExpectedPerPacketOverhead() const {
std::unique_ptr<RtpPacketToSend> RTPSender::AllocatePacket(
rtc::ArrayView<const uint32_t> csrcs) {
MutexLock lock(&send_mutex_);
// TODO(danilchap): Remove this fallback together with SetCsrcs.
// New code shouldn't set csrcs_, keeping it empty,
// Old code would pass default value for csrcs, which is empty.
RTC_DCHECK(csrcs.empty() || csrcs_.empty());
if (csrcs.empty()) {
csrcs = csrcs_;
}
RTC_DCHECK_LE(csrcs.size(), kRtpCsrcSize);
if (csrcs.size() > max_num_csrcs_) {
max_num_csrcs_ = csrcs.size();
@ -618,12 +610,6 @@ void RTPSender::SetMid(absl::string_view mid) {
UpdateHeaderSizes();
}
void RTPSender::SetCsrcs(const std::vector<uint32_t>& csrcs) {
RTC_DCHECK_LE(csrcs.size(), kRtpCsrcSize);
MutexLock lock(&send_mutex_);
csrcs_ = csrcs;
}
static void CopyHeaderAndExtensionsToRtxPacket(const RtpPacketToSend& packet,
RtpPacketToSend* rtx_packet) {
// Set the relevant fixed packet headers. The following are not set:
@ -636,8 +622,7 @@ static void CopyHeaderAndExtensionsToRtxPacket(const RtpPacketToSend& packet,
// Set the variable fields in the packet header:
// * CSRCs - must be set before header extensions.
// * Header extensions - replace Rid header with RepairedRid header.
const std::vector<uint32_t> csrcs = packet.Csrcs();
rtx_packet->SetCsrcs(csrcs);
rtx_packet->SetCsrcs(packet.Csrcs());
for (int extension_num = kRtpExtensionNone + 1;
extension_num < kRtpExtensionNumberOfExtensions; ++extension_num) {
auto extension = static_cast<RTPExtensionType>(extension_num);

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

@ -65,10 +65,6 @@ class RTPSender {
uint16_t SequenceNumber() const RTC_LOCKS_EXCLUDED(send_mutex_);
void SetSequenceNumber(uint16_t seq) RTC_LOCKS_EXCLUDED(send_mutex_);
[[deprecated("Pass csrcs in the AllocatePacket")]] //
void
SetCsrcs(const std::vector<uint32_t>& csrcs) RTC_LOCKS_EXCLUDED(send_mutex_);
void SetMaxRtpPacketSize(size_t max_packet_size)
RTC_LOCKS_EXCLUDED(send_mutex_);
@ -208,7 +204,6 @@ class RTPSender {
// when to stop sending the MID and RID header extensions.
bool ssrc_has_acked_ RTC_GUARDED_BY(send_mutex_);
bool rtx_ssrc_has_acked_ RTC_GUARDED_BY(send_mutex_);
std::vector<uint32_t> csrcs_ RTC_GUARDED_BY(send_mutex_);
// Maximum number of csrcs this sender is used with.
size_t max_num_csrcs_ RTC_GUARDED_BY(send_mutex_) = 0;
int rtx_ RTC_GUARDED_BY(send_mutex_);