diff --git a/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h index 1d9f2ad6c3..8616bb85cc 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp.h +++ b/modules/rtp_rtcp/include/rtp_rtcp.h @@ -124,16 +124,9 @@ class RtpRtcp : public Module, public RtcpFeedbackSenderInterface { // SSRCs for media and retransmission, respectively. // FlexFec SSRC is fetched from |flexfec_sender|. - // |media_send_ssrc| has been deprecated, use local_media_ssrc instead. - absl::optional media_send_ssrc; absl::optional local_media_ssrc; absl::optional rtx_send_ssrc; - // TODO(bugs.webrtc.org/10774): Remove this fallback. - absl::optional get_local_media_ssrc() const { - return local_media_ssrc ? local_media_ssrc : media_send_ssrc; - } - private: RTC_DISALLOW_COPY_AND_ASSIGN(Configuration); }; diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc index 20cfb8f24e..71005daaf2 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -138,7 +138,7 @@ RTCPReceiver::RTCPReceiver(const RtpRtcp::Configuration& config, : (config.audio ? kDefaultAudioReportInterval : kDefaultVideoReportInterval)), // TODO(bugs.webrtc.org/10774): Remove fallback. - main_ssrc_(config.get_local_media_ssrc().value_or(0)), + main_ssrc_(config.local_media_ssrc.value_or(0)), remote_ssrc_(0), remote_sender_rtp_time_(0), xr_rrtr_status_(false), @@ -153,8 +153,8 @@ RTCPReceiver::RTCPReceiver(const RtpRtcp::Configuration& config, num_skipped_packets_(0), last_skipped_packets_warning_ms_(clock_->TimeInMilliseconds()) { RTC_DCHECK(owner); - if (config.get_local_media_ssrc()) { - registered_ssrcs_.insert(*config.get_local_media_ssrc()); + if (config.local_media_ssrc) { + registered_ssrcs_.insert(*config.local_media_ssrc); } if (config.rtx_send_ssrc) { registered_ssrcs_.insert(*config.rtx_send_ssrc); diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc index a54b451ba0..c06a428ea6 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/modules/rtp_rtcp/source/rtcp_sender.cc @@ -130,7 +130,7 @@ RTCPSender::RTCPSender(const RtpRtcp::Configuration& config) timestamp_offset_(0), last_rtp_timestamp_(0), last_frame_capture_time_ms_(-1), - ssrc_(config.get_local_media_ssrc().value_or(0)), + ssrc_(config.local_media_ssrc.value_or(0)), remote_ssrc_(0), receive_statistics_(config.receive_statistics), diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index ac0c8e8bac..b068894c98 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -136,7 +136,7 @@ RTPSender::RTPSender(const RtpRtcp::Configuration& config) bitrate_callback_(config.send_bitrate_observer), // RTP variables sequence_number_forced_(false), - ssrc_(config.get_local_media_ssrc()), + ssrc_(config.local_media_ssrc), ssrc_has_acked_(false), rtx_ssrc_has_acked_(false), last_rtp_timestamp_(0),