Support encrypted RTP extensions (RFC 6904)

webrtc/media/engine/webrtcmediaengine.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 114 matching lines @@
         extensions->erase(it);
       }
       found = true;
     }
   }
 }
 }  // namespace
 
 bool ValidateRtpExtensions(
     const std::vector<webrtc::RtpExtension>& extensions) {
-  bool id_used[14] = {false};
+  int id_used[14] = {false};

[pthatcher1, 2017/03/21 07:07:06]

Why was this changed?

[joachim, 2017/03/23 00:04:32]

This was a leftover from some earlier testing code I missed. Reverted, thanks
for spotting.

   for (const auto& extension : extensions) {
     if (extension.id <= 0 || extension.id >= 15) {
       LOG(LS_ERROR) << "Bad RTP extension ID: " << extension.ToString();
       return false;
     }
     if (id_used[extension.id - 1]) {
       LOG(LS_ERROR) << "Duplicate RTP extension ID: " << extension.ToString();
       return false;
     }
     id_used[extension.id - 1] = true;
@@ skipping 22 matching lines @@
   // specified in a different order (also allows us to use std::unique below).
   std::sort(result.begin(), result.end(),
             [](const webrtc::RtpExtension& rhs,
                const webrtc::RtpExtension& lhs) { return rhs.uri < lhs.uri; });
 
   // Remove unnecessary extensions (used on send side).
   if (filter_redundant_extensions) {
     auto it = std::unique(
         result.begin(), result.end(),
         [](const webrtc::RtpExtension& rhs, const webrtc::RtpExtension& lhs) {
-          return rhs.uri == lhs.uri;
+          return rhs.uri == lhs.uri && rhs.encrypted == lhs.encrypted;
         });
     result.erase(it, result.end());
 
     // Keep just the highest priority extension of any in the following list.
     static const char* kBweExtensionPriorities[] = {
         webrtc::RtpExtension::kTransportSequenceNumberUri,
         webrtc::RtpExtension::kAbsSendTimeUri,
         webrtc::RtpExtension::kTimestampOffsetUri};
     DiscardRedundantExtensions(&result, kBweExtensionPriorities);
   }
@@ skipping 20 matching lines @@
   }
   if (codec.GetParam(kCodecParamMaxBitrate, &bitrate_kbps) &&
       bitrate_kbps > 0) {
     config.max_bitrate_bps = bitrate_kbps * 1000;
   } else {
     config.max_bitrate_bps = -1;
   }
   return config;
 }
 }  // namespace cricket