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

webrtc/ortc/testrtpparameters.cc

 /*
  *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 145 matching lines @@
   RtpCodecParameters dtmf_codec;
   dtmf_codec.name = "telephone-event";
   dtmf_codec.kind = cricket::MEDIA_TYPE_AUDIO;
   dtmf_codec.payload_type = 126;
   dtmf_codec.clock_rate.emplace(8000);
   parameters.codecs.push_back(std::move(dtmf_codec));
 
   // "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;
   encoding.codec_payload_type.emplace(preferred_payload_type);
   encoding.dtx.emplace(DtxStatus::ENABLED);
   // 20 kbps.
   encoding.max_bitrate_bps.emplace(20000);
   parameters.encodings.push_back(std::move(encoding));
 
   parameters.header_extensions.emplace_back(
@@ skipping 82 matching lines @@
   RtpCodecParameters ulpfec_codec;
   ulpfec_codec.name = "ulpfec";
   ulpfec_codec.kind = cricket::MEDIA_TYPE_VIDEO;
   ulpfec_codec.payload_type = 117;
   ulpfec_codec.clock_rate.emplace(90000);
   parameters.codecs.push_back(std::move(ulpfec_codec));
 
   // "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;
   encoding.codec_payload_type.emplace(preferred_payload_type);
   encoding.fec.emplace(FecMechanism::RED_AND_ULPFEC);
   // Will create default RtxParameters, with unset SSRC.
   encoding.rtx.emplace();
   // 100 kbps.
   encoding.max_bitrate_bps.emplace(100000);
   parameters.encodings.push_back(std::move(encoding));
@@ skipping 14 matching lines @@
 
 RtpParameters MakeFullVp8Parameters() {
   return MakeFullVideoParameters(100);
 }
 
 RtpParameters MakeFullVp9Parameters() {
   return MakeFullVideoParameters(101);
 }
 
 }  // namespace webrtc