zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup, remove media_send_ssrc field

Browse Source 
Bug: webrtc:10774
Change-Id: I007c969a5d275f83676a4c733d605b7351ea30f9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/149819
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28962}
This commit is contained in:
Erik Språng
2019-08-21 15:54:16 +02:00
committed by Commit Bot
parent 8a61d0f233
commit c15f92aceb
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/rtp_rtcp/include/rtp_rtcp.h
View File

@ -124,16 +124,9 @@ class RtpRtcp : public Module, public RtcpFeedbackSenderInterface {
// SSRCs for media and retransmission, respectively. // SSRCs for media and retransmission, respectively.
// FlexFec SSRC is fetched from |flexfec_sender|. // FlexFec SSRC is fetched from |flexfec_sender|.
// |media_send_ssrc| has been deprecated, use local_media_ssrc instead.
absl::optional<uint32_t> media_send_ssrc;
absl::optional<uint32_t> local_media_ssrc; absl::optional<uint32_t> local_media_ssrc;
absl::optional<uint32_t> rtx_send_ssrc; absl::optional<uint32_t> rtx_send_ssrc;
// TODO(bugs.webrtc.org/10774): Remove this fallback.
absl::optional<uint32_t> get_local_media_ssrc() const {
return local_media_ssrc ? local_media_ssrc : media_send_ssrc;
}
private: private:
RTC_DISALLOW_COPY_AND_ASSIGN(Configuration); RTC_DISALLOW_COPY_AND_ASSIGN(Configuration);
}; };

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

@ -138,7 +138,7 @@ RTCPReceiver::RTCPReceiver(const RtpRtcp::Configuration& config,
: (config.audio ? kDefaultAudioReportInterval : (config.audio ? kDefaultAudioReportInterval
: kDefaultVideoReportInterval)), : kDefaultVideoReportInterval)),
// TODO(bugs.webrtc.org/10774): Remove fallback. // 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_ssrc_(0),
remote_sender_rtp_time_(0), remote_sender_rtp_time_(0),
xr_rrtr_status_(false), xr_rrtr_status_(false),
@ -153,8 +153,8 @@ RTCPReceiver::RTCPReceiver(const RtpRtcp::Configuration& config,
num_skipped_packets_(0), num_skipped_packets_(0),
last_skipped_packets_warning_ms_(clock_->TimeInMilliseconds()) { last_skipped_packets_warning_ms_(clock_->TimeInMilliseconds()) {
RTC_DCHECK(owner); RTC_DCHECK(owner);
if (config.get_local_media_ssrc()) { if (config.local_media_ssrc) {
registered_ssrcs_.insert(*config.get_local_media_ssrc()); registered_ssrcs_.insert(*config.local_media_ssrc);
} }
if (config.rtx_send_ssrc) { if (config.rtx_send_ssrc) {
registered_ssrcs_.insert(*config.rtx_send_ssrc); registered_ssrcs_.insert(*config.rtx_send_ssrc);

2
modules/rtp_rtcp/source/rtcp_sender.cc
View File

@ -130,7 +130,7 @@ RTCPSender::RTCPSender(const RtpRtcp::Configuration& config)
timestamp_offset_(0), timestamp_offset_(0),
last_rtp_timestamp_(0), last_rtp_timestamp_(0),
last_frame_capture_time_ms_(-1), 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), remote_ssrc_(0),
receive_statistics_(config.receive_statistics), receive_statistics_(config.receive_statistics),

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

@ -136,7 +136,7 @@ RTPSender::RTPSender(const RtpRtcp::Configuration& config)
bitrate_callback_(config.send_bitrate_observer), bitrate_callback_(config.send_bitrate_observer),
// RTP variables // RTP variables
sequence_number_forced_(false), sequence_number_forced_(false),
ssrc_(config.get_local_media_ssrc()), ssrc_(config.local_media_ssrc),
ssrc_has_acked_(false), ssrc_has_acked_(false),
rtx_ssrc_has_acked_(false), rtx_ssrc_has_acked_(false),
last_rtp_timestamp_(0), last_rtp_timestamp_(0),