Negotiate H264 profiles in SDP

webrtc/media/engine/webrtcvideoengine2.cc

 /*
  *  Copyright (c) 2014 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 620 matching lines @@
   std::stringstream out;
   const std::vector<VideoCodec>& codecs =
       external_encoder_factory->supported_codecs();
   for (size_t i = 0; i < codecs.size(); ++i) {
     VideoCodec codec = codecs[i];
     out << codec.name;
     if (i != codecs.size() - 1) {
       out << ", ";
     }
     // Don't add internally-supported codecs twice.
-    if (IsCodecSupported(supported_codecs, codec))
+    if (FindMatchingCodec(supported_codecs, codec))
       continue;
 
     // External video encoders are given payloads 120-127. This also means that
     // we only support up to 8 external payload types.
     // TODO(deadbeef): mediasession.cc already has code to dynamically
     // determine a payload type. We should be able to just leave the payload
     // type empty and let mediasession determine it. However, currently RTX
     // codecs are associated to codecs by payload type, meaning we DO need
     // to allocate unique payload types here. So to make this change we would
     // need to make RTX codecs associated by name instead.
@@ skipping 41 matching lines @@
     delete kv.second;
 }
 
 rtc::Optional<WebRtcVideoChannel2::VideoCodecSettings>
 WebRtcVideoChannel2::SelectSendVideoCodec(
     const std::vector<VideoCodecSettings>& remote_mapped_codecs) const {
   const std::vector<VideoCodec> local_supported_codecs =
       GetSupportedCodecs(external_encoder_factory_);
   // Select the first remote codec that is supported locally.
   for (const VideoCodecSettings& remote_mapped_codec : remote_mapped_codecs) {
-    if (IsCodecSupported(local_supported_codecs, remote_mapped_codec.codec))
+    // For H264, we will limit the encode level to the remote offered level
+    // regardless if level asymmetry is allowed or not. This is strictly not
+    // following the spec in https://tools.ietf.org/html/rfc6184#section-8.2.2
+    // since we should limit the encode level to the lower of local and remote
+    // level when level asymmetry is not allowed.
+    if (FindMatchingCodec(local_supported_codecs, remote_mapped_codec.codec))
       return rtc::Optional<VideoCodecSettings>(remote_mapped_codec);
   }
   // No remote codec was supported.
   return rtc::Optional<VideoCodecSettings>();
 }
 
 bool WebRtcVideoChannel2::ReceiveCodecsHaveChanged(
     std::vector<VideoCodecSettings> before,
     std::vector<VideoCodecSettings> after) {
   if (before.size() != after.size()) {
@@ skipping 248 matching lines @@
       MapCodecs(params.codecs);
   if (mapped_codecs.empty()) {
     LOG(LS_ERROR) << "SetRecvParameters called without any video codecs.";
     return false;
   }
 
   // Verify that every mapped codec is supported locally.
   const std::vector<VideoCodec> local_supported_codecs =
       GetSupportedCodecs(external_encoder_factory_);
   for (const VideoCodecSettings& mapped_codec : mapped_codecs) {
-    if (!IsCodecSupported(local_supported_codecs, mapped_codec.codec)) {
+    if (!FindMatchingCodec(local_supported_codecs, mapped_codec.codec)) {
       LOG(LS_ERROR) << "SetRecvParameters called with unsupported video codec: "
                     << mapped_codec.codec.ToString();
       return false;
     }
   }
 
   if (ReceiveCodecsHaveChanged(recv_codecs_, mapped_codecs)) {
     changed_params->codec_settings =
         rtc::Optional<std::vector<VideoCodecSettings>>(mapped_codecs);
   }
@@ skipping 1591 matching lines @@
         rtx_mapping[video_codecs[i].codec.id] !=
             ulpfec_config.red_payload_type) {
       video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
     }
   }
 
   return video_codecs;
 }
 
 }  // namespace cricket