Support encrypted RTP extensions (RFC 6904)

webrtc/pc/srtpfilter.h

Index: webrtc/pc/srtpfilter.h
diff --git a/webrtc/pc/srtpfilter.h b/webrtc/pc/srtpfilter.h
index 3df787646c740eb819f93986e697de0daabf1237..380f26d9fa8a69b9fe0cc9efcb9e66155c22a41e 100644
--- a/webrtc/pc/srtpfilter.h
+++ b/webrtc/pc/srtpfilter.h
@@ -83,9 +83,11 @@ class SrtpFilter {
   bool SetRtpParams(int send_cs,
                     const uint8_t* send_key,
                     int send_key_len,
+                    const std::vector<int>& send_encrypted_headers,
                     int recv_cs,
                     const uint8_t* recv_key,
-                    int recv_key_len);
+                    int recv_key_len,
+                    const std::vector<int>& recv_encrypted_headers);
   bool SetRtcpParams(int send_cs,
                      const uint8_t* send_key,
                      int send_key_len,
@@ -195,10 +197,12 @@ class SrtpSession {
 
   // Configures the session for sending data using the specified
   // cipher-suite and key. Receiving must be done by a separate session.
-  bool SetSend(int cs, const uint8_t* key, size_t len);
+  bool SetSend(int cs, const uint8_t* key, size_t len,
+      const std::vector<int>& encrypted_headers);
   // Configures the session for receiving data using the specified
   // cipher-suite and key. Sending must be done by a separate session.
-  bool SetRecv(int cs, const uint8_t* key, size_t len);
+  bool SetRecv(int cs, const uint8_t* key, size_t len,
+      const std::vector<int>& encrypted_headers);
 
   // Encrypts/signs an individual RTP/RTCP packet, in-place.
   // If an HMAC is used, this will increase the packet size.
@@ -243,7 +247,8 @@ class SrtpSession {
       SignalSrtpError;
 
  private:
-  bool SetKey(int type, int cs, const uint8_t* key, size_t len);
+  bool SetKey(int type, int cs, const uint8_t* key, size_t len,

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

SetKeyAndEncryptedHeaders?

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

Done.

+      const std::vector<int>& encrypted_headers);
     // Returns send stream current packet index from srtp db.
   bool GetSendStreamPacketIndex(void* data, int in_len, int64_t* index);