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

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

Issue 2447893002: Remove remnants of libsrtp1 (Closed)
Patch Set: include order Created 4 years, 1 month 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.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
(...skipping 10 matching lines...) Expand all
21 #include "webrtc/base/constructormagic.h" 21 #include "webrtc/base/constructormagic.h"
22 #include "webrtc/base/criticalsection.h" 22 #include "webrtc/base/criticalsection.h"
23 #include "webrtc/base/sigslotrepeater.h" 23 #include "webrtc/base/sigslotrepeater.h"
24 #include "webrtc/base/sslstreamadapter.h" 24 #include "webrtc/base/sslstreamadapter.h"
25 #include "webrtc/base/thread_checker.h" 25 #include "webrtc/base/thread_checker.h"
26 #include "webrtc/media/base/cryptoparams.h" 26 #include "webrtc/media/base/cryptoparams.h"
27 #include "webrtc/p2p/base/sessiondescription.h" 27 #include "webrtc/p2p/base/sessiondescription.h"
28 28
29 // Forward declaration to avoid pulling in libsrtp headers here 29 // Forward declaration to avoid pulling in libsrtp headers here
30 struct srtp_event_data_t; 30 struct srtp_event_data_t;
31
32 // Libsrtp V1/V2 compatibility hack.
33 // TODO(mattdr): Remove this #define after libsrtp 2.0 is in.
34 #define srtp_ctx_t_ srtp_ctx_t
35
36 struct srtp_ctx_t_; 31 struct srtp_ctx_t_;
37 32
38 namespace cricket { 33 namespace cricket {
39 34
40 class SrtpSession; 35 class SrtpSession;
41 class SrtpStat; 36 class SrtpStat;
42 37
43 void ShutdownSrtp(); 38 void ShutdownSrtp();
44 39
45 // Class to transform SRTP to/from RTP. 40 // Class to transform SRTP to/from RTP.
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 std::map<FailureKey, FailureStat> failures_; 298 std::map<FailureKey, FailureStat> failures_;
304 // Threshold in ms to silent the signaling errors. 299 // Threshold in ms to silent the signaling errors.
305 int signal_silent_time_; 300 int signal_silent_time_;
306 301
307 RTC_DISALLOW_COPY_AND_ASSIGN(SrtpStat); 302 RTC_DISALLOW_COPY_AND_ASSIGN(SrtpStat);
308 }; 303 };
309 304
310 } // namespace cricket 305 } // namespace cricket
311 306
312 #endif // WEBRTC_PC_SRTPFILTER_H_ 307 #endif // WEBRTC_PC_SRTPFILTER_H_
OLDNEW
« no previous file with comments | « webrtc/pc/pc.gyp ('k') | webrtc/pc/srtpfilter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698