| Index: talk/session/media/srtpfilter.h
|
| diff --git a/talk/session/media/srtpfilter.h b/talk/session/media/srtpfilter.h
|
| index 3c3a8e848b2b9db52b59778c8975d28e25549017..d30cee69c31302bcfae0bd613646b73e06300df9 100644
|
| --- a/talk/session/media/srtpfilter.h
|
| +++ b/talk/session/media/srtpfilter.h
|
| @@ -104,16 +104,16 @@ class SrtpFilter {
|
|
|
| // Just set up both sets of keys directly.
|
| // Used with DTLS-SRTP.
|
| - bool SetRtpParams(const std::string& send_cs,
|
| + bool SetRtpParams(int send_cs,
|
| const uint8_t* send_key,
|
| int send_key_len,
|
| - const std::string& recv_cs,
|
| + int recv_cs,
|
| const uint8_t* recv_key,
|
| int recv_key_len);
|
| - bool SetRtcpParams(const std::string& send_cs,
|
| + bool SetRtcpParams(int send_cs,
|
| const uint8_t* send_key,
|
| int send_key_len,
|
| - const std::string& recv_cs,
|
| + int recv_cs,
|
| const uint8_t* recv_key,
|
| int recv_key_len);
|
|
|
| @@ -199,10 +199,10 @@ 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(const std::string& cs, const uint8_t* key, int len);
|
| + bool SetSend(int cs, const uint8_t* key, int len);
|
| // Configures the session for receiving data using the specified
|
| // cipher-suite and key. Sending must be done by a separate session.
|
| - bool SetRecv(const std::string& cs, const uint8_t* key, int len);
|
| + bool SetRecv(int cs, const uint8_t* key, int len);
|
|
|
| // Encrypts/signs an individual RTP/RTCP packet, in-place.
|
| // If an HMAC is used, this will increase the packet size.
|
| @@ -232,7 +232,7 @@ class SrtpSession {
|
| SignalSrtpError;
|
|
|
| private:
|
| - bool SetKey(int type, const std::string& cs, const uint8_t* key, int len);
|
| + bool SetKey(int type, int cs, const uint8_t* key, int len);
|
| // Returns send stream current packet index from srtp db.
|
| bool GetSendStreamPacketIndex(void* data, int in_len, int64_t* index);
|
|
|
|
|