From 4ad09762daa973d289c5414aeb86bc51ddc51270 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Thu, 2 Dec 2021 11:43:28 +0100 Subject: [PATCH] Delete legacy RtpPacketSendInfo::ssrc field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:12713 Change-Id: I8785eaabbb8725fb119067f5897ef245e6187996 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/239642 Auto-Submit: Danil Chapovalov Commit-Queue: Erik Språng Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/main@{#35460} --- modules/rtp_rtcp/include/rtp_rtcp_defines.h | 2 -- .../rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc | 2 -- modules/rtp_rtcp/source/rtp_sender_egress.cc | 2 -- 3 files changed, 6 deletions(-) diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index dfdf641ed2..45cb659b5f 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -228,8 +228,6 @@ struct RtpPacketSendInfo { RtpPacketSendInfo() = default; uint16_t transport_sequence_number = 0; - // TODO(bugs.webrtc.org/12713): Remove once downstream usage is gone. - uint32_t ssrc = 0; absl::optional media_ssrc; uint16_t rtp_sequence_number = 0; // Only valid if `media_ssrc` is set. uint32_t rtp_timestamp = 0; diff --git a/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc b/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc index 201a1ce05c..c5c06840d2 100644 --- a/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc +++ b/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc @@ -323,8 +323,6 @@ void DEPRECATED_RtpSenderEgress::AddPacketToTransportFeedback( } RtpPacketSendInfo packet_info; - // TODO(bugs.webrtc.org/12713): Remove once downstream usage is gone. - packet_info.ssrc = ssrc_; packet_info.media_ssrc = ssrc_; packet_info.transport_sequence_number = packet_id; packet_info.rtp_sequence_number = packet.SequenceNumber(); diff --git a/modules/rtp_rtcp/source/rtp_sender_egress.cc b/modules/rtp_rtcp/source/rtp_sender_egress.cc index 89c5597c1b..eb55378083 100644 --- a/modules/rtp_rtcp/source/rtp_sender_egress.cc +++ b/modules/rtp_rtcp/source/rtp_sender_egress.cc @@ -445,8 +445,6 @@ void RtpSenderEgress::AddPacketToTransportFeedback( // or lost. break; } - // TODO(bugs.webrtc.org/12713): Remove once downstream usage is gone. - packet_info.ssrc = packet_info.media_ssrc.value_or(0); transport_feedback_observer_->OnAddPacket(packet_info); }