Removed double-special-casing of ISAC in libjingle and WebRtcVoE.

webrtc/pc/webrtcsdp_unittest.cc

 /*
  *  Copyright 2011 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 1110 matching lines @@
   AudioContentDescription* CreateAudioContentDescription() {
     AudioContentDescription* audio = new AudioContentDescription();
     audio->set_rtcp_mux(true);
     audio->set_rtcp_reduced_size(true);
     audio->AddCrypto(CryptoParams(1, "AES_CM_128_HMAC_SHA1_32",
         "inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32",
         "dummy_session_params"));
     audio->set_protocol(cricket::kMediaProtocolSavpf);
     AudioCodec opus(111, "opus", 48000, 0, 2);
     audio->AddCodec(opus);
-    audio->AddCodec(AudioCodec(103, "ISAC", 16000, 32000, 1));
-    audio->AddCodec(AudioCodec(104, "ISAC", 32000, 56000, 1));
+    audio->AddCodec(AudioCodec(103, "ISAC", 16000, 0, 1));
+    audio->AddCodec(AudioCodec(104, "ISAC", 32000, 0, 1));
     return audio;
   }
 
   // Creates a video content description with no streams, and some default
   // configuration.
   VideoContentDescription* CreateVideoContentDescription() {
     VideoContentDescription* video = new VideoContentDescription();
     video->AddCrypto(CryptoParams(
         1, "AES_CM_128_HMAC_SHA1_80",
         "inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32", ""));
@@ skipping 514 matching lines @@
     VerifyCodecParameter(opus.params, "minptime", params.min_ptime);
     VerifyCodecParameter(opus.params, "stereo", params.stereo);
     VerifyCodecParameter(opus.params, "sprop-stereo", params.sprop_stereo);
     VerifyCodecParameter(opus.params, "useinbandfec", params.useinband);
     VerifyCodecParameter(opus.params, "maxaveragebitrate",
                          params.maxaveragebitrate);
     for (size_t i = 0; i < acd->codecs().size(); ++i) {
       cricket::AudioCodec codec = acd->codecs()[i];
       VerifyCodecParameter(codec.params, "ptime", params.ptime);
       VerifyCodecParameter(codec.params, "maxptime", params.max_ptime);
-      if (codec.name == "ISAC") {
-        if (codec.clockrate == 16000) {
-          EXPECT_EQ(32000, codec.bitrate);
-        } else {
-          EXPECT_EQ(56000, codec.bitrate);
-        }
-      }
     }
 
     const ContentInfo* vc = GetFirstVideoContent(jdesc_output->description());
     ASSERT_TRUE(vc != NULL);
     const VideoContentDescription* vcd =
         static_cast<const VideoContentDescription*>(vc->description);
     ASSERT_FALSE(vcd->codecs().empty());
     cricket::VideoCodec vp8 = vcd->codecs()[0];
     EXPECT_EQ("VP8", vp8.name);
     EXPECT_EQ(99, vp8.id);
@@ skipping 584 matching lines @@
   JsepSessionDescription jdesc(kDummyString);
   EXPECT_TRUE(SdpDeserialize(kSdpNoRtpmapString, &jdesc));
   cricket::AudioContentDescription* audio =
     static_cast<AudioContentDescription*>(
         jdesc.description()->GetContentDescriptionByName(cricket::CN_AUDIO));
   AudioCodecs ref_codecs;
   // The codecs in the AudioContentDescription should be in the same order as
   // the payload types (<fmt>s) on the m= line.
   ref_codecs.push_back(AudioCodec(0, "PCMU", 8000, 0, 1));
   ref_codecs.push_back(AudioCodec(18, "G729", 16000, 0, 1));
-  ref_codecs.push_back(AudioCodec(103, "ISAC", 16000, 32000, 1));
+  ref_codecs.push_back(AudioCodec(103, "ISAC", 16000, 0, 1));
   EXPECT_EQ(ref_codecs, audio->codecs());
 }
 
 TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutRtpmapButWithFmtp) {
   static const char kSdpNoRtpmapString[] =
       "v=0\r\n"
       "o=- 11 22 IN IP4 127.0.0.1\r\n"
       "s=-\r\n"
       "t=0 0\r\n"
       "m=audio 49232 RTP/AVP 18 103\r\n"
@@ skipping 1076 matching lines @@
   JsepSessionDescription jdesc_output(kDummyString);
   EXPECT_TRUE(
       SdpDeserialize(kSdpWithIceCredentialsInCandidateString, &jdesc_output));
   const IceCandidateCollection* candidates = jdesc_output.candidates(0);
   ASSERT_NE(nullptr, candidates);
   ASSERT_EQ(1, candidates->count());
   cricket::Candidate c = candidates->at(0)->candidate();
   EXPECT_EQ("ufrag_voice", c.username());
   EXPECT_EQ("pwd_voice", c.password());
 }