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

Remove unused non-standard RtpEncodingParameters members

Browse Source 
Bug: webrtc:7580
Change-Id: Ic1a6e52f25eb35c797e669bffe8040ec84fec386
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160415
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29983}
This commit is contained in:
Florent Castelli
2019-11-28 15:48:24 +01:00
committed by Commit Bot
parent 6c0e94650e
commit a8c2f5180f
6 changed files with 3 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pc/rtp_parameters_conversion.cc
View File

@ -234,17 +234,9 @@ RTCErrorOr<cricket::StreamParamsVec> ToCricketStreamParamsVec(
}
cricket::StreamParamsVec cricket_streams;
const RtpEncodingParameters& encoding = encodings[0];
if (encoding.rtx && encoding.rtx->ssrc && !encoding.ssrc) {
LOG_AND_RETURN_ERROR(RTCErrorType::UNSUPPORTED_PARAMETER,
"Setting an RTX SSRC explicitly while leaving the "
"primary SSRC unset is not currently supported.");
}
if (encoding.ssrc) {
cricket::StreamParams stream_params;
stream_params.add_ssrc(*encoding.ssrc);
if (encoding.rtx && encoding.rtx->ssrc) {
stream_params.AddFidSsrc(*encoding.ssrc, *encoding.rtx->ssrc);
}
cricket_streams.push_back(std::move(stream_params));
}
return std::move(cricket_streams);
@ -308,11 +300,6 @@ std::vector<RtpEncodingParameters> ToRtpEncodings(
for (const cricket::StreamParams& stream_param : stream_params) {
RtpEncodingParameters rtp_encoding;
rtp_encoding.ssrc.emplace(stream_param.first_ssrc());
uint32_t rtx_ssrc = 0;
if (stream_param.GetFidSsrc(stream_param.first_ssrc(), &rtx_ssrc)) {
RtpRtxParameters rtx_param(rtx_ssrc);
rtp_encoding.rtx.emplace(rtx_param);
}
rtp_encodings.push_back(std::move(rtp_encoding));
}
return rtp_encodings;