Support encrypted RTP extensions (RFC 6904)

webrtc/config.h

 /*
  *  Copyright (c) 2013 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 40 matching lines @@
 
   // Payload type used for RED packets.
   int red_payload_type;
 
   // RTX payload type for RED payload.
   int red_rtx_payload_type;
 };
 
 // RTP header extension, see RFC 5285.
 struct RtpExtension {
-  RtpExtension() : id(0) {}
+  RtpExtension() {}
   RtpExtension(const std::string& uri, int id) : uri(uri), id(id) {}
+  RtpExtension(const std::string& uri, int id, bool encrypted) : uri(uri),
+      id(id), encrypted(encrypted) {}
   std::string ToString() const;
   bool operator==(const RtpExtension& rhs) const {
-    return uri == rhs.uri && id == rhs.id;
+    return uri == rhs.uri && id == rhs.id && encrypted == rhs.encrypted;
   }
   static bool IsSupportedForAudio(const std::string& uri);
   static bool IsSupportedForVideo(const std::string& uri);
+  static bool AllowEncrypt(const std::string& uri);

[Taylor Brandstetter, 2017/03/22 18:00:10]

Can you leave a comment describing this method?

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

Done.

 
   // Header extension for audio levels, as defined in:
   // http://tools.ietf.org/html/draft-ietf-avtext-client-to-mixer-audio-level-03
   static const char* kAudioLevelUri;
   static const int kAudioLevelDefaultId;
 
   // Header extension for RTP timestamp offset, see RFC 5450 for details:
   // http://tools.ietf.org/html/rfc5450
   static const char* kTimestampOffsetUri;
   static const int kTimestampOffsetDefaultId;
@@ skipping 10 matching lines @@
   static const int kVideoRotationDefaultId;
 
   // Header extension for transport sequence number, see url for details:
   // http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions
   static const char* kTransportSequenceNumberUri;
   static const int kTransportSequenceNumberDefaultId;
 
   static const char* kPlayoutDelayUri;
   static const int kPlayoutDelayDefaultId;
 
+  // Encryption of Header Extensions, see RFC 6904 for details:
+  // https://tools.ietf.org/html/rfc6904
+  static const char* kEncryptHeaderExtensionsUri;
+
   // Inclusive min and max IDs for one-byte header extensions, per RFC5285.
   static const int kMinId;
   static const int kMaxId;
 
   std::string uri;
-  int id;
+  int id = 0;
+  bool encrypted = false;

[Taylor Brandstetter, 2017/03/22 18:00:10]

nit: If this was just "encrypt" rather than "encrypted", it would match the
naming of the ORTC "RtpHeaderExtensionParameters", and the string "encrypt" in
the URI.

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

Done.

 };
 
 struct VideoStream {
   VideoStream();
   ~VideoStream();
   std::string ToString() const;
 
   size_t width;
   size_t height;
   int max_framerate;
@@ skipping 113 matching lines @@
 
  private:
   // Access to the copy constructor is private to force use of the Copy()
   // method for those exceptional cases where we do use it.
   VideoEncoderConfig(const VideoEncoderConfig&);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_CONFIG_H_