Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1230)

Unified Diff: webrtc/pc/srtpsession.cc

Issue 2969543002: Remove libsrtp 2.0.0 compatibility code. (Closed)
Patch Set: Rebased. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/srtpsession.cc
diff --git a/webrtc/pc/srtpsession.cc b/webrtc/pc/srtpsession.cc
index e8b29460a71d6e6eeb7702832c240a34de4a7cff..67ae9a6629fb4163935344d52e401053c9ea3a13 100644
--- a/webrtc/pc/srtpsession.cc
+++ b/webrtc/pc/srtpsession.cc
@@ -154,21 +154,11 @@ bool SrtpSession::GetRtpAuthParams(uint8_t** key, int* key_len, int* tag_len) {
// stream_template will be the reference context for other streams.
// Let's use it for getting the keys.
srtp_stream_ctx_t* srtp_context = session_->stream_template;
-#if defined(SRTP_MAX_MKI_LEN)
- // libsrtp 2.1.0
if (srtp_context && srtp_context->session_keys &&
srtp_context->session_keys->rtp_auth) {
external_hmac = reinterpret_cast<ExternalHmacContext*>(
srtp_context->session_keys->rtp_auth->state);
}
-#else
- // libsrtp 2.0.0
- // TODO(jbauch): Remove after switching to libsrtp 2.1.0
- if (srtp_context && srtp_context->rtp_auth) {
- external_hmac =
- reinterpret_cast<ExternalHmacContext*>(srtp_context->rtp_auth->state);
- }
-#endif
if (!external_hmac) {
LOG(LS_ERROR) << "Failed to get auth keys from libsrtp!.";
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698