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

webrtc/media/base/codec.h

 /*
  *  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 46 matching lines @@
  private:
   bool HasDuplicateEntries() const;
 
   std::vector<FeedbackParam> params_;
 };
 
 struct Codec {
   int id;
   std::string name;
   int clockrate;
-  int preference;
   CodecParameterMap params;
   FeedbackParams feedback_params;
 
   // Creates a codec with the given parameters.
-  Codec(int id, const std::string& name, int clockrate, int preference);
+  Codec(int id, const std::string& name, int clockrate);
   // Creates an empty codec.
   Codec();
   Codec(const Codec& c);
   ~Codec();
 
   // Indicates if this codec is compatible with the specified codec.
   bool Matches(const Codec& codec) const;
 
   // Find the parameter for |name| and write the value to |out|.
   bool GetParam(const std::string& name, std::string* out) const;
   bool GetParam(const std::string& name, int* out) const;
 
   void SetParam(const std::string& name, const std::string& value);
   void SetParam(const std::string& name, int value);
 
   // It is safe to input a non-existent parameter.
   // Returns true if the parameter existed, false if it did not exist.
   bool RemoveParam(const std::string& name);
 
   bool HasFeedbackParam(const FeedbackParam& param) const;
   void AddFeedbackParam(const FeedbackParam& param);
 
-  static bool Preferable(const Codec& first, const Codec& other) {
-    return first.preference > other.preference;
-  }
-
   // Filter |this| feedbacks params such that only those shared by both |this|
   // and |other| are kept.
   void IntersectFeedbackParams(const Codec& other);
 
   Codec& operator=(const Codec& c);
 
   bool operator==(const Codec& c) const;
 
   bool operator!=(const Codec& c) const {
     return !(*this == c);
   }
 };
 
 struct AudioCodec : public Codec {
   int bitrate;
   size_t channels;
 
   // Creates a codec with the given parameters.
   AudioCodec(int id,
              const std::string& name,
              int clockrate,
              int bitrate,
-             size_t channels,
-             int preference);
+             size_t channels);
   // Creates an empty codec.
   AudioCodec();
   AudioCodec(const AudioCodec& c);
   ~AudioCodec() = default;
 
   // Indicates if this codec is compatible with the specified codec.
   bool Matches(const AudioCodec& codec) const;
 
-  static bool Preferable(const AudioCodec& first, const AudioCodec& other) {
-    return first.preference > other.preference;
-  }
-
   std::string ToString() const;
 
   AudioCodec& operator=(const AudioCodec& c);
 
   bool operator==(const AudioCodec& c) const;
 
   bool operator!=(const AudioCodec& c) const {
     return !(*this == c);
   }
 };
 
 struct VideoCodec : public Codec {
   int width;
   int height;
   int framerate;
 
   // Creates a codec with the given parameters.
   VideoCodec(int id,
              const std::string& name,
              int width,
              int height,
-             int framerate,
-             int preference);
+             int framerate);
   VideoCodec(int id, const std::string& name);
   // Creates an empty codec.
   VideoCodec();
   VideoCodec(const VideoCodec& c);
   ~VideoCodec() = default;
 
-  static bool Preferable(const VideoCodec& first, const VideoCodec& other) {
-    return first.preference > other.preference;
-  }
-
   std::string ToString() const;
 
   VideoCodec& operator=(const VideoCodec& c);
 
   bool operator==(const VideoCodec& c) const;
 
   bool operator!=(const VideoCodec& c) const {
     return !(*this == c);
   }
 
   static VideoCodec CreateRtxCodec(int rtx_payload_type,
                                    int associated_payload_type);
 
   enum CodecType {
     CODEC_VIDEO,
     CODEC_RED,
     CODEC_ULPFEC,
     CODEC_RTX,
   };
 
   CodecType GetCodecType() const;
   // Validates a VideoCodec's payload type, dimensions and bitrates etc. If they
   // don't make sense (such as max < min bitrate), and error is logged and
   // ValidateCodecFormat returns false.
   bool ValidateCodecFormat() const;
 };
 
 struct DataCodec : public Codec {
-  DataCodec(int id, const std::string& name, int preference);
+  DataCodec(int id, const std::string& name);
   DataCodec();
   DataCodec(const DataCodec& c);
 
   DataCodec& operator=(const DataCodec& c);
 
   std::string ToString() const;
 };
 
 // Get the codec setting associated with |payload_type|. If there
 // is no codec associated with that payload type it returns false.
@@ skipping 11 matching lines @@
 }
 
 bool CodecNamesEq(const std::string& name1, const std::string& name2);
 bool HasNack(const Codec& codec);
 bool HasRemb(const Codec& codec);
 bool HasTransportCc(const Codec& codec);
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_CODEC_H_