| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 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 14 matching lines...) Expand all Loading... |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #include "talk/session/media/mediasession.h" | 28 #include "talk/session/media/mediasession.h" |
| 29 | 29 |
| 30 #include <functional> | 30 #include <functional> |
| 31 #include <map> | 31 #include <map> |
| 32 #include <set> | 32 #include <set> |
| 33 #include <utility> | 33 #include <utility> |
| 34 | 34 |
| 35 #include "talk/media/base/constants.h" | |
| 36 #include "talk/media/base/cryptoparams.h" | |
| 37 #include "talk/session/media/channelmanager.h" | 35 #include "talk/session/media/channelmanager.h" |
| 38 #include "talk/session/media/srtpfilter.h" | 36 #include "talk/session/media/srtpfilter.h" |
| 39 #include "webrtc/base/helpers.h" | 37 #include "webrtc/base/helpers.h" |
| 40 #include "webrtc/base/logging.h" | 38 #include "webrtc/base/logging.h" |
| 41 #include "webrtc/base/scoped_ptr.h" | 39 #include "webrtc/base/scoped_ptr.h" |
| 42 #include "webrtc/base/stringutils.h" | 40 #include "webrtc/base/stringutils.h" |
| 41 #include "webrtc/media/base/constants.h" |
| 42 #include "webrtc/media/base/cryptoparams.h" |
| 43 #include "webrtc/p2p/base/constants.h" | 43 #include "webrtc/p2p/base/constants.h" |
| 44 | 44 |
| 45 #ifdef HAVE_SCTP | 45 #ifdef HAVE_SCTP |
| 46 #include "talk/media/sctp/sctpdataengine.h" | 46 #include "webrtc/media/sctp/sctpdataengine.h" |
| 47 #else | 47 #else |
| 48 static const uint32_t kMaxSctpSid = 1023; | 48 static const uint32_t kMaxSctpSid = 1023; |
| 49 #endif | 49 #endif |
| 50 | 50 |
| 51 namespace { | 51 namespace { |
| 52 const char kInline[] = "inline:"; | 52 const char kInline[] = "inline:"; |
| 53 | 53 |
| 54 void GetSupportedCryptoSuiteNames(void (*func)(std::vector<int>*), | 54 void GetSupportedCryptoSuiteNames(void (*func)(std::vector<int>*), |
| 55 std::vector<std::string>* names) { | 55 std::vector<std::string>* names) { |
| 56 #ifdef HAVE_SRTP | 56 #ifdef HAVE_SRTP |
| (...skipping 1930 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1987 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO)); | 1987 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO)); |
| 1988 } | 1988 } |
| 1989 | 1989 |
| 1990 const DataContentDescription* GetFirstDataContentDescription( | 1990 const DataContentDescription* GetFirstDataContentDescription( |
| 1991 const SessionDescription* sdesc) { | 1991 const SessionDescription* sdesc) { |
| 1992 return static_cast<const DataContentDescription*>( | 1992 return static_cast<const DataContentDescription*>( |
| 1993 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA)); | 1993 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA)); |
| 1994 } | 1994 } |
| 1995 | 1995 |
| 1996 } // namespace cricket | 1996 } // namespace cricket |
| OLD | NEW |