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

Side by Side Diff: webrtc/pc/srtpfilter.cc

Issue 1913043003: Revert of Remove the rtc_relative_path GYP variable and similar defines (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « webrtc/pc/pc.gyp ('k') | webrtc/pc/srtpfilter_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2009 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2009 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/pc/srtpfilter.h" 11 #include "webrtc/pc/srtpfilter.h"
12 12
13 #include <string.h> 13 #include <string.h>
14 14
15 #include <algorithm> 15 #include <algorithm>
16 16
17 #include "webrtc/base/base64.h" 17 #include "webrtc/base/base64.h"
18 #include "webrtc/base/byteorder.h" 18 #include "webrtc/base/byteorder.h"
19 #include "webrtc/base/common.h" 19 #include "webrtc/base/common.h"
20 #include "webrtc/base/logging.h" 20 #include "webrtc/base/logging.h"
21 #include "webrtc/base/stringencode.h" 21 #include "webrtc/base/stringencode.h"
22 #include "webrtc/base/timeutils.h" 22 #include "webrtc/base/timeutils.h"
23 #include "webrtc/media/base/rtputils.h" 23 #include "webrtc/media/base/rtputils.h"
24 24
25 // Enable this line to turn on SRTP debugging 25 // Enable this line to turn on SRTP debugging
26 // #define SRTP_DEBUG 26 // #define SRTP_DEBUG
27 27
28 #ifdef HAVE_SRTP 28 #ifdef HAVE_SRTP
29 extern "C" { 29 extern "C" {
30 #ifdef SRTP_RELATIVE_PATH
31 #include "srtp.h" // NOLINT
32 #include "srtp_priv.h" // NOLINT
33 #else
30 #include "third_party/libsrtp/srtp/include/srtp.h" 34 #include "third_party/libsrtp/srtp/include/srtp.h"
31 #include "third_party/libsrtp/srtp/include/srtp_priv.h" 35 #include "third_party/libsrtp/srtp/include/srtp_priv.h"
36 #endif // SRTP_RELATIVE_PATH
32 } 37 }
33 #ifdef ENABLE_EXTERNAL_AUTH 38 #ifdef ENABLE_EXTERNAL_AUTH
34 #include "webrtc/pc/externalhmac.h" 39 #include "webrtc/pc/externalhmac.h"
35 #endif // ENABLE_EXTERNAL_AUTH 40 #endif // ENABLE_EXTERNAL_AUTH
36 #if !defined(NDEBUG) 41 #if !defined(NDEBUG)
37 extern "C" debug_module_t mod_srtp; 42 extern "C" debug_module_t mod_srtp;
38 extern "C" debug_module_t mod_auth; 43 extern "C" debug_module_t mod_auth;
39 extern "C" debug_module_t mod_cipher; 44 extern "C" debug_module_t mod_cipher;
40 extern "C" debug_module_t mod_stat; 45 extern "C" debug_module_t mod_stat;
41 extern "C" debug_module_t mod_alloc; 46 extern "C" debug_module_t mod_alloc;
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 SrtpNotAvailable(__FUNCTION__); 926 SrtpNotAvailable(__FUNCTION__);
922 } 927 }
923 928
924 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) { 929 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) {
925 SrtpNotAvailable(__FUNCTION__); 930 SrtpNotAvailable(__FUNCTION__);
926 } 931 }
927 932
928 #endif // HAVE_SRTP 933 #endif // HAVE_SRTP
929 934
930 } // namespace cricket 935 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/pc.gyp ('k') | webrtc/pc/srtpfilter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698