Support encrypted RTP extensions (RFC 6904)

webrtc/media/engine/webrtcmediaengine.cc

Index: webrtc/media/engine/webrtcmediaengine.cc
diff --git a/webrtc/media/engine/webrtcmediaengine.cc b/webrtc/media/engine/webrtcmediaengine.cc
index 9b5fef2478f3e26805b9959774ca45928e079796..e61336e3e4f75c8301f1fdb53ca49796a1f6b5e2 100644
--- a/webrtc/media/engine/webrtcmediaengine.cc
+++ b/webrtc/media/engine/webrtcmediaengine.cc
@@ -132,7 +132,7 @@ void DiscardRedundantExtensions(
 
 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();
@@ -175,7 +175,7 @@ std::vector<webrtc::RtpExtension> FilterRtpExtensions(
     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());