Accept all the media profiles required by JSEP.

webrtc/pc/mediasession.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 39 matching lines @@
 namespace cricket {
 
 
 // RTP Profile names
 // http://www.iana.org/assignments/rtp-parameters/rtp-parameters.xml
 // RFC4585
 const char kMediaProtocolAvpf[] = "RTP/AVPF";
 // RFC5124
 const char kMediaProtocolDtlsSavpf[] = "UDP/TLS/RTP/SAVPF";
 
+// The accepted pattern for media protocol (JSEP Section 5.1.3)
+const std::vector<std::string> kMediaProtocols = {"RTP/SAVPF", "RTP/SAVP",
+                                                  "RTP/AVPF", "RTP/AVP"};

[Avi (use Gerrit), 2016/04/13 17:42:05]

This is a static initializer.

+const std::vector<std::string> kMediaProtocolsDtls = {
+    "UDP/TLS/RTP/SAVPF", "UDP/TLS/RTP/SAVP", "TCP/TLS/RTP/SAVPF",
+    "TCP/TLS/RTP/SAVP"};

[Avi (use Gerrit), 2016/04/13 17:42:05]

This is a static initializer.

+
 // We always generate offers with "UDP/TLS/RTP/SAVPF" when using DTLS-SRTP,
 // but we tolerate "RTP/SAVPF" in offers we receive, for compatibility.
 const char kMediaProtocolSavpf[] = "RTP/SAVPF";
 
 const char kMediaProtocolRtpPrefix[] = "RTP/";
 
 const char kMediaProtocolSctp[] = "SCTP";
 const char kMediaProtocolDtlsSctp[] = "DTLS/SCTP";
 const char kMediaProtocolUdpDtlsSctp[] = "UDP/DTLS/SCTP";
 const char kMediaProtocolTcpDtlsSctp[] = "TCP/DTLS/SCTP";
@@ skipping 1028 matching lines @@
                                 : MD_SENDRECV);
       break;
     default:
       RTC_DCHECK(false && "MediaContentDescription has unexpected direction.");
       break;
   }
 
   return true;
 }
 
+static bool IsProtocolFound(const std::vector<std::string> protocols,
+                            const std::string& protocol) {
+  return std::find(protocols.begin(), protocols.end(), protocol) !=
+         protocols.end();
+}
+
 static bool IsMediaProtocolSupported(MediaType type,
                                      const std::string& protocol,
                                      bool secure_transport) {
   // Data channels can have a protocol of SCTP or SCTP/DTLS.

[Avi (use Gerrit), 2016/04/13 17:42:05]

You can totally put those variable declarations into this function as:

const std::vector<std::string> kMediaProtocols = ...
const std::vector<std::string> kMediaProtocolsDtls = ...

and they'll be initialized safely when this function is first called.

   if (type == MEDIA_TYPE_DATA &&
       ((protocol == kMediaProtocolSctp && !secure_transport)||
        (protocol == kMediaProtocolDtlsSctp && secure_transport))) {
     return true;
   }
 
   // Since not all applications serialize and deserialize the media protocol,
   // we will have to accept |protocol| to be empty.
-  return protocol == kMediaProtocolAvpf || protocol.empty() ||
-      protocol == kMediaProtocolSavpf ||
-      (protocol == kMediaProtocolDtlsSavpf && secure_transport);
+  return protocol.empty() || IsProtocolFound(kMediaProtocols, protocol) ||
+         (IsProtocolFound(kMediaProtocolsDtls, protocol) && secure_transport);
 }
 
 static void SetMediaProtocol(bool secure_transport,
                              MediaContentDescription* desc) {
   if (!desc->cryptos().empty())
     desc->set_protocol(kMediaProtocolSavpf);
   else if (secure_transport)
     desc->set_protocol(kMediaProtocolDtlsSavpf);
   else
     desc->set_protocol(kMediaProtocolAvpf);
@@ skipping 861 matching lines @@
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
 }
 
 const DataContentDescription* GetFirstDataContentDescription(
     const SessionDescription* sdesc) {
   return static_cast<const DataContentDescription*>(
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
 }
 
 }  // namespace cricket