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

webrtc/pc/mediasession_unittest.cc

 /*
  *  Copyright 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 57 matching lines @@
 using cricket::MEDIA_TYPE_VIDEO;
 using cricket::MEDIA_TYPE_DATA;
 using cricket::RtpHeaderExtension;
 using cricket::SEC_DISABLED;
 using cricket::SEC_ENABLED;
 using cricket::SEC_REQUIRED;
 using rtc::CS_AES_CM_128_HMAC_SHA1_32;
 using rtc::CS_AES_CM_128_HMAC_SHA1_80;
 
 static const AudioCodec kAudioCodecs1[] = {
-  AudioCodec(103, "ISAC",   16000, -1,    1, 6),
-  AudioCodec(102, "iLBC",   8000,  13300, 1, 5),
-  AudioCodec(0,   "PCMU",   8000,  64000, 1, 4),
-  AudioCodec(8,   "PCMA",   8000,  64000, 1, 3),
-  AudioCodec(117, "red",    8000,  0,     1, 2),
-  AudioCodec(107, "CN",     48000, 0,     1, 1)
-};
+    AudioCodec(103, "ISAC", 16000, -1, 1),
+    AudioCodec(102, "iLBC", 8000, 13300, 1),
+    AudioCodec(0, "PCMU", 8000, 64000, 1),
+    AudioCodec(8, "PCMA", 8000, 64000, 1),
+    AudioCodec(117, "red", 8000, 0, 1),
+    AudioCodec(107, "CN", 48000, 0, 1)};
 
 static const AudioCodec kAudioCodecs2[] = {
-  AudioCodec(126, "speex",  16000, 22000, 1, 3),
-  AudioCodec(0,   "PCMU",   8000,  64000, 1, 2),
-  AudioCodec(127, "iLBC",   8000,  13300, 1, 1),
+    AudioCodec(126, "speex", 16000, 22000, 1),
+    AudioCodec(0, "PCMU", 8000, 64000, 1),
+    AudioCodec(127, "iLBC", 8000, 13300, 1),
 };
 
 static const AudioCodec kAudioCodecsAnswer[] = {
-  AudioCodec(102, "iLBC",   8000,  13300, 1, 5),
-  AudioCodec(0,   "PCMU",   8000,  64000, 1, 4),
+    AudioCodec(102, "iLBC", 8000, 13300, 1),
+    AudioCodec(0, "PCMU", 8000, 64000, 1),
 };
 
 static const VideoCodec kVideoCodecs1[] = {
-  VideoCodec(96, "H264-SVC", 320, 200, 30, 2),
-  VideoCodec(97, "H264", 320, 200, 30, 1)
-};
+    VideoCodec(96, "H264-SVC", 320, 200, 30),
+    VideoCodec(97, "H264", 320, 200, 30)};
 
 static const VideoCodec kVideoCodecs2[] = {
-  VideoCodec(126, "H264", 320, 200, 30, 2),
-  VideoCodec(127, "H263", 320, 200, 30, 1)
-};
+    VideoCodec(126, "H264", 320, 200, 30),
+    VideoCodec(127, "H263", 320, 200, 30)};
 
 static const VideoCodec kVideoCodecsAnswer[] = {
-  VideoCodec(97, "H264", 320, 200, 30, 1)
-};
+    VideoCodec(97, "H264", 320, 200, 30)};
 
-static const DataCodec kDataCodecs1[] = {
-  DataCodec(98, "binary-data", 2),
-  DataCodec(99, "utf8-text", 1)
-};
+static const DataCodec kDataCodecs1[] = {DataCodec(98, "binary-data"),
+                                         DataCodec(99, "utf8-text")};
 
-static const DataCodec kDataCodecs2[] = {
-  DataCodec(126, "binary-data", 2),
-  DataCodec(127, "utf8-text", 1)
-};
+static const DataCodec kDataCodecs2[] = {DataCodec(126, "binary-data"),
+                                         DataCodec(127, "utf8-text")};
 
-static const DataCodec kDataCodecsAnswer[] = {
-  DataCodec(98, "binary-data", 2),
-  DataCodec(99, "utf8-text", 1)
-};
+static const DataCodec kDataCodecsAnswer[] = {DataCodec(98, "binary-data"),
+                                              DataCodec(99, "utf8-text")};
 
 static const RtpHeaderExtension kAudioRtpExtension1[] = {
   RtpHeaderExtension("urn:ietf:params:rtp-hdrext:ssrc-audio-level", 8),
   RtpHeaderExtension("http://google.com/testing/audio_something", 10),
 };
 
 static const RtpHeaderExtension kAudioRtpExtension2[] = {
   RtpHeaderExtension("urn:ietf:params:rtp-hdrext:ssrc-audio-level", 2),
   RtpHeaderExtension("http://google.com/testing/audio_something_else", 8),
   RtpHeaderExtension("http://google.com/testing/both_audio_and_video", 7),
@@ skipping 1428 matching lines @@
 
   const VideoContentDescription* vcd =
       GetFirstVideoContentDescription(answer.get());
 
   std::vector<VideoCodec> expected_codecs = MAKE_VECTOR(kVideoCodecsAnswer);
   AddRtxCodec(VideoCodec::CreateRtxCodec(126, kVideoCodecs1[1].id),
               &expected_codecs);
 
   EXPECT_EQ(expected_codecs, vcd->codecs());
 
-  // Now, make sure we get same result, except for the preference order,
-  // if |f2_| creates an updated offer even though the default payload types
-  // are different from |f1_|.
-  expected_codecs[0].preference = f1_codecs[1].preference;
-
+  // Now, make sure we get same result (except for the order) if |f2_| creates
+  // an updated offer even though the default payload types between |f1_| and
+  // |f2_| are different.
   std::unique_ptr<SessionDescription> updated_offer(
       f2_.CreateOffer(opts, answer.get()));
   ASSERT_TRUE(updated_offer);
   std::unique_ptr<SessionDescription> updated_answer(
       f1_.CreateAnswer(updated_offer.get(), opts, answer.get()));
 
   const VideoContentDescription* updated_vcd =
       GetFirstVideoContentDescription(updated_answer.get());
 
   EXPECT_EQ(expected_codecs, updated_vcd->codecs());
@@ skipping 99 matching lines @@
   EXPECT_EQ(expected_codecs, updated_vcd->codecs());
 }
 
 // Test that RTX is ignored when there is no associated payload type parameter.
 TEST_F(MediaSessionDescriptionFactoryTest, RtxWithoutApt) {
   MediaSessionOptions opts;
   opts.recv_video = true;
   opts.recv_audio = false;
   std::vector<VideoCodec> f1_codecs = MAKE_VECTOR(kVideoCodecs1);
   // This creates RTX without associated payload type parameter.
-  AddRtxCodec(VideoCodec(126, cricket::kRtxCodecName, 0, 0, 0, 0), &f1_codecs);
+  AddRtxCodec(VideoCodec(126, cricket::kRtxCodecName, 0, 0, 0), &f1_codecs);
   f1_.set_video_codecs(f1_codecs);
 
   std::vector<VideoCodec> f2_codecs = MAKE_VECTOR(kVideoCodecs2);
   // This creates RTX for H264 with the payload type |f2_| uses.
   AddRtxCodec(VideoCodec::CreateRtxCodec(125, kVideoCodecs2[0].id), &f2_codecs);
   f2_.set_video_codecs(f2_codecs);
 
   std::unique_ptr<SessionDescription> offer(f1_.CreateOffer(opts, NULL));
   ASSERT_TRUE(offer.get() != NULL);
   // kCodecParamAssociatedPayloadType will always be added to the offer when RTX
@@ skipping 127 matching lines @@
 TEST_F(MediaSessionDescriptionFactoryTest, SimSsrcsGenerateMultipleRtxSsrcs) {
   MediaSessionOptions opts;
   opts.recv_video = true;
   opts.recv_audio = false;
 
   // Add simulcast streams.
   opts.AddSendVideoStream("stream1", "stream1label", 3);
 
   // Use a single real codec, and then add RTX for it.
   std::vector<VideoCodec> f1_codecs;
-  f1_codecs.push_back(VideoCodec(97, "H264", 320, 200, 30, 1));
+  f1_codecs.push_back(VideoCodec(97, "H264", 320, 200, 30));
   AddRtxCodec(VideoCodec::CreateRtxCodec(125, 97), &f1_codecs);
   f1_.set_video_codecs(f1_codecs);
 
   // Ensure that the offer has an RTX ssrc for each regular ssrc, and that there
   // is a FID ssrc + grouping for each.
   std::unique_ptr<SessionDescription> offer(f1_.CreateOffer(opts, NULL));
   ASSERT_TRUE(offer.get() != NULL);
   VideoContentDescription* desc = static_cast<VideoContentDescription*>(
       offer->GetContentDescriptionByName(cricket::CN_VIDEO));
   ASSERT_TRUE(desc != NULL);
@@ skipping 528 matching lines @@
   const ContentInfo* audio_content = GetFirstAudioContent(updated_offer.get());
   const ContentInfo* video_content = GetFirstVideoContent(updated_offer.get());
   const ContentInfo* data_content = GetFirstDataContent(updated_offer.get());
   ASSERT_TRUE(audio_content != nullptr);
   ASSERT_TRUE(video_content != nullptr);
   ASSERT_TRUE(data_content != nullptr);
   EXPECT_EQ("audio_modified", audio_content->name);
   EXPECT_EQ("video_modified", video_content->name);
   EXPECT_EQ("data_modified", data_content->name);
 }