Removing `preference` field from `cricket::Codec`.

webrtc/media/engine/webrtcvoiceengine.cc

 /*
  *  Copyright (c) 2004 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 233 matching lines @@
   return config;
 }
 
 class WebRtcVoiceCodecs final {
  public:
   // TODO(solenberg): Do this filtering once off-line, add a simple AudioCodec
   // list and add a test which verifies VoE supports the listed codecs.
   static std::vector<AudioCodec> SupportedCodecs() {
     LOG(LS_INFO) << "WebRtc VoiceEngine codecs:";
     std::vector<AudioCodec> result;
-    for (webrtc::CodecInst voe_codec : webrtc::acm2::RentACodec::Database()) {
-      // Change the sample rate of G722 to 8000 to match SDP.
-      MaybeFixupG722(&voe_codec, 8000);
-      // Skip uncompressed formats.
-      if (IsCodec(voe_codec, kL16CodecName)) {
-        continue;
-      }
+    // Iterate first over our preferred codecs list, so that the results are
+    // added in order of preference.
+    for (size_t i = 0; i < arraysize(kCodecPrefs); ++i) {
+      const CodecPref* pref = &kCodecPrefs[i];
+      for (webrtc::CodecInst voe_codec : webrtc::acm2::RentACodec::Database()) {
+        // Change the sample rate of G722 to 8000 to match SDP.
+        MaybeFixupG722(&voe_codec, 8000);
+        // Skip uncompressed formats.
+        if (IsCodec(voe_codec, kL16CodecName)) {
+          continue;
+        }
 
-      const CodecPref* pref = NULL;
-      for (size_t j = 0; j < arraysize(kCodecPrefs); ++j) {
-        if (IsCodec(voe_codec, kCodecPrefs[j].name) &&
-            kCodecPrefs[j].clockrate == voe_codec.plfreq &&
-            kCodecPrefs[j].channels == voe_codec.channels) {
-          pref = &kCodecPrefs[j];
-          break;
+        if (!IsCodec(voe_codec, pref->name) ||
+            pref->clockrate != voe_codec.plfreq ||
+            pref->channels != voe_codec.channels) {
+          // Not a match.
+          continue;
         }
-      }
 
-      if (pref) {
-        // Use the payload type that we've configured in our pref table;
-        // use the offset in our pref table to determine the sort order.
-        AudioCodec codec(
-            pref->payload_type, voe_codec.plname, voe_codec.plfreq,
-            voe_codec.rate, voe_codec.channels,
-            static_cast<int>(arraysize(kCodecPrefs)) - (pref - kCodecPrefs));
-        LOG(LS_INFO) << ToString(codec);
+        AudioCodec codec(pref->payload_type, voe_codec.plname, voe_codec.plfreq,
+                         voe_codec.rate, voe_codec.channels);
+        LOG(LS_INFO) << "Adding supported codec: " << ToString(codec);
         if (IsCodec(codec, kIsacCodecName)) {
           // Indicate auto-bitrate in signaling.
           codec.bitrate = 0;
         }
         if (IsCodec(codec, kOpusCodecName)) {
           // Only add fmtp parameters that differ from the spec.
           if (kPreferredMinPTime != kOpusDefaultMinPTime) {
             codec.params[kCodecParamMinPTime] =
                 rtc::ToString(kPreferredMinPTime);
           }
           if (kPreferredMaxPTime != kOpusDefaultMaxPTime) {
             codec.params[kCodecParamMaxPTime] =
                 rtc::ToString(kPreferredMaxPTime);
           }
           codec.SetParam(kCodecParamUseInbandFec, 1);
           codec.AddFeedbackParam(
               FeedbackParam(kRtcpFbParamTransportCc, kParamValueEmpty));
 
           // TODO(hellner): Add ptime, sprop-stereo, and stereo
           // when they can be set to values other than the default.
         }
         result.push_back(codec);
-      } else {
-        LOG(LS_WARNING) << "Unexpected codec: " << ToString(voe_codec);
       }
     }
-    // Make sure they are in local preference order.
-    std::sort(result.begin(), result.end(), &AudioCodec::Preferable);
     return result;
   }
 
   static bool ToCodecInst(const AudioCodec& in,
                           webrtc::CodecInst* out) {
     for (webrtc::CodecInst voe_codec : webrtc::acm2::RentACodec::Database()) {
       // Change the sample rate of G722 to 8000 to match SDP.
       MaybeFixupG722(&voe_codec, 8000);
       AudioCodec codec(voe_codec.pltype, voe_codec.plname, voe_codec.plfreq,
-                       voe_codec.rate, voe_codec.channels, 0);
+                       voe_codec.rate, voe_codec.channels);
       bool multi_rate = IsCodecMultiRate(voe_codec);
       // Allow arbitrary rates for ISAC to be specified.
       if (multi_rate) {
         // Set codec.bitrate to 0 so the check for codec.Matches() passes.
         codec.bitrate = 0;
       }
       if (codec.Matches(in)) {
         if (out) {
           // Fixup the payload type.
           voe_codec.pltype = in.id;
@@ skipping 2223 matching lines @@
     }
   } else {
     LOG(LS_INFO) << "Stopping playout for channel #" << channel;
     engine()->voe()->base()->StopPlayout(channel);
   }
   return true;
 }
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE