Simplify IsFmtpParam according to RFC 4855.

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 3056 matching lines @@
   EXPECT_EQ(120, vp8.id);
   cricket::CodecParameterMap::iterator found =
       vp8.params.find("x-google-min-bitrate");
   ASSERT_TRUE(found != vp8.params.end());
   EXPECT_EQ(found->second, "10");
   found = vp8.params.find("x-google-max-quantization");
   ASSERT_TRUE(found != vp8.params.end());
   EXPECT_EQ(found->second, "40");
 }
 
+TEST_F(WebRtcSdpTest, SerializeAudioFmtpWithUnknownParameter) {
+  AudioContentDescription* acd = static_cast<AudioContentDescription*>(
+      GetFirstAudioContent(&desc_)->description);
+
+  cricket::AudioCodecs codecs = acd->codecs();
+  codecs[0].params["unknown-future-parameter"] = "SomeFutureValue";
+  acd->set_codecs(codecs);
+
+  ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
+                                jdesc_.session_id(),
+                                jdesc_.session_version()));
+  std::string message = webrtc::SdpSerialize(jdesc_, false);
+  std::string sdp_with_fmtp = kSdpFullString;
+  InjectAfter("a=rtpmap:111 opus/48000/2\r\n",
+              "a=fmtp:111 unknown-future-parameter=SomeFutureValue\r\n",
+              &sdp_with_fmtp);
+  EXPECT_EQ(sdp_with_fmtp, message);
+}
+
+TEST_F(WebRtcSdpTest, SerializeAudioFmtpWithKnownFmtpParameter) {
+  AudioContentDescription* acd = static_cast<AudioContentDescription*>(
+      GetFirstAudioContent(&desc_)->description);
+
+  cricket::AudioCodecs codecs = acd->codecs();
+  codecs[0].params["stereo"] = "1";
+  acd->set_codecs(codecs);
+
+  ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
+                                jdesc_.session_id(),
+                                jdesc_.session_version()));
+  std::string message = webrtc::SdpSerialize(jdesc_, false);
+  std::string sdp_with_fmtp = kSdpFullString;
+  InjectAfter("a=rtpmap:111 opus/48000/2\r\n",
+              "a=fmtp:111 stereo=1\r\n",
+              &sdp_with_fmtp);
+  EXPECT_EQ(sdp_with_fmtp, message);
+}
+
+TEST_F(WebRtcSdpTest, SerializeAudioFmtpWithPTimeAndMaxPTime) {
+  AudioContentDescription* acd = static_cast<AudioContentDescription*>(
+      GetFirstAudioContent(&desc_)->description);
+
+  cricket::AudioCodecs codecs = acd->codecs();
+  codecs[0].params["ptime"] = "20";
+  codecs[0].params["maxptime"] = "120";
+  acd->set_codecs(codecs);
+
+  ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
+                                jdesc_.session_id(),
+                                jdesc_.session_version()));
+  std::string message = webrtc::SdpSerialize(jdesc_, false);
+  std::string sdp_with_fmtp = kSdpFullString;
+  InjectAfter("a=rtpmap:104 ISAC/32000\r\n",
+              "a=maxptime:120\r\n"  // No comma here. String merging!
+              "a=ptime:20\r\n",
+              &sdp_with_fmtp);
+  EXPECT_EQ(sdp_with_fmtp, message);
+}
+
 TEST_F(WebRtcSdpTest, SerializeVideoFmtp) {
   VideoContentDescription* vcd = static_cast<VideoContentDescription*>(
       GetFirstVideoContent(&desc_)->description);
 
   cricket::VideoCodecs codecs = vcd->codecs();
   codecs[0].params["x-google-min-bitrate"] = "10";
   vcd->set_codecs(codecs);
 
   ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
                                 jdesc_.session_id(),
@@ skipping 271 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());
 }