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

Rename RtpRtcp::Configuration::media_send_ssrc to local_media_ssrc

Browse Source 
The name media_send_ssrc makes less sense when used mostly for the
RtcpReceiver functionality.

The old member is still there and used as a fallback. That will be
cleaned away after downstream code is fixed.

Bug: webrtc:10774
Change-Id: I4ec18db76910f31dfe76bc9b137ffe89220d3fa8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/149836
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28923}
This commit is contained in:
Erik Språng
2019-08-20 17:22:36 +02:00
committed by Commit Bot
parent e8ef87bdad
commit 54d5d2c75b
16 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,11 +122,18 @@ class RtpRtcp : public Module, public RtcpFeedbackSenderInterface {
// defaults to webrtc::FieldTrialBasedConfig.
const WebRtcKeyValueConfig* field_trials = nullptr;
// SSRCs for sending media and retransmission, respectively.
// 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<uint32_t> media_send_ssrc;
absl::optional<uint32_t> local_media_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:
RTC_DISALLOW_COPY_AND_ASSIGN(Configuration);
};