admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bad use of std::sort in test method.

Browse Source 
It was used to force a codec to the top of a list, but it resulted in
"a < a" being true, which some C++ runtimes complain about.

BUG=None
TBR=pthatcher@webrtc.org

Review-Url: https://codereview.webrtc.org/2963543002
Cr-Commit-Position: refs/heads/master@{#18786}
This commit is contained in:
deadbeef 2017-06-27 07:52:50 -07:00 committed by Commit Bot
parent 376473054c
commit 8179a7cf97
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/ortc/testrtpparameters.cc
View File

@ -163,11 +163,13 @@ RtpParameters MakeFullAudioParameters(int preferred_payload_type) {
// "codec_payload_type" isn't implemented, so we need to reorder codecs to
// cause one to be used.
// TODO(deadbeef): Remove this when it becomes unnecessary.
std::sort(parameters.codecs.begin(), parameters.codecs.end(),
[preferred_payload_type](const RtpCodecParameters& a,
const RtpCodecParameters& b) {
return a.payload_type == preferred_payload_type;
});
auto it = std::find_if(parameters.codecs.begin(), parameters.codecs.end(),
[preferred_payload_type](const RtpCodecParameters& p) {
return p.payload_type == preferred_payload_type;
});
RtpCodecParameters preferred = *it;
parameters.codecs.erase(it);
parameters.codecs.insert(parameters.codecs.begin(), preferred);
// Intentionally leave out SSRC so one's chosen automatically.
RtpEncodingParameters encoding;
@ -270,11 +272,13 @@ RtpParameters MakeFullVideoParameters(int preferred_payload_type) {
// "codec_payload_type" isn't implemented, so we need to reorder codecs to
// cause one to be used.
// TODO(deadbeef): Remove this when it becomes unnecessary.
std::sort(parameters.codecs.begin(), parameters.codecs.end(),
[preferred_payload_type](const RtpCodecParameters& a,
const RtpCodecParameters& b) {
return a.payload_type == preferred_payload_type;
});
auto it = std::find_if(parameters.codecs.begin(), parameters.codecs.end(),
[preferred_payload_type](const RtpCodecParameters& p) {
return p.payload_type == preferred_payload_type;
});
RtpCodecParameters preferred = *it;
parameters.codecs.erase(it);
parameters.codecs.insert(parameters.codecs.begin(), preferred);
// Intentionally leave out SSRC so one's chosen automatically.
RtpEncodingParameters encoding;