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..0c55023f23a9a817112f70d5d3051d95cd44117e 100644
--- a/webrtc/media/engine/webrtcmediaengine.cc
+++ b/webrtc/media/engine/webrtcmediaengine.cc
@@ -164,18 +164,22 @@ std::vector<webrtc::RtpExtension> FilterRtpExtensions(
     }
   }
 
-  // Sort by name, ascending, so that we don't reset extensions if they were
-  // specified in a different order (also allows us to use std::unique below).
+  // Sort by name, ascending (prioritise encryption), so that we don't reset
+  // extensions if they were 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; });
+               const webrtc::RtpExtension& lhs) {
+                return rhs.encrypt == lhs.encrypt ? rhs.uri < lhs.uri
+                                                  : rhs.encrypt > lhs.encrypt;
+              });
 
   // 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.encrypt == lhs.encrypt;
         });
     result.erase(it, result.end());