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

Side by Side Diff: talk/session/media/srtpfilter.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 | « talk/session/media/srtpfilter.h ('k') | talk/session/media/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 * libjingle 2 * libjingle
3 * Copyright 2009 Google Inc. 3 * Copyright 2009 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 15 matching lines...) Expand all
26 */ 26 */
27 27
28 #undef HAVE_CONFIG_H 28 #undef HAVE_CONFIG_H
29 29
30 #include "talk/session/media/srtpfilter.h" 30 #include "talk/session/media/srtpfilter.h"
31 31
32 #include <string.h> 32 #include <string.h>
33 33
34 #include <algorithm> 34 #include <algorithm>
35 35
36 #include "talk/media/base/rtputils.h"
37 #include "webrtc/base/base64.h" 36 #include "webrtc/base/base64.h"
38 #include "webrtc/base/byteorder.h" 37 #include "webrtc/base/byteorder.h"
39 #include "webrtc/base/common.h" 38 #include "webrtc/base/common.h"
40 #include "webrtc/base/logging.h" 39 #include "webrtc/base/logging.h"
41 #include "webrtc/base/stringencode.h" 40 #include "webrtc/base/stringencode.h"
42 #include "webrtc/base/timeutils.h" 41 #include "webrtc/base/timeutils.h"
42 #include "webrtc/media/base/rtputils.h"
43 43
44 // Enable this line to turn on SRTP debugging 44 // Enable this line to turn on SRTP debugging
45 // #define SRTP_DEBUG 45 // #define SRTP_DEBUG
46 46
47 #ifdef HAVE_SRTP 47 #ifdef HAVE_SRTP
48 extern "C" { 48 extern "C" {
49 #ifdef SRTP_RELATIVE_PATH 49 #ifdef SRTP_RELATIVE_PATH
50 #include "srtp.h" // NOLINT 50 #include "srtp.h" // NOLINT
51 #include "srtp_priv.h" // NOLINT 51 #include "srtp_priv.h" // NOLINT
52 #else 52 #else
(...skipping 892 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 SrtpNotAvailable(__FUNCTION__); 945 SrtpNotAvailable(__FUNCTION__);
946 } 946 }
947 947
948 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) { 948 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) {
949 SrtpNotAvailable(__FUNCTION__); 949 SrtpNotAvailable(__FUNCTION__);
950 } 950 }
951 951
952 #endif // HAVE_SRTP 952 #endif // HAVE_SRTP
953 953
954 } // namespace cricket 954 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/session/media/srtpfilter.h ('k') | talk/session/media/srtpfilter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698