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 16 matching lines...) Expand all Loading... |
27 | 27 |
28 // Types and classes used in media session descriptions. | 28 // Types and classes used in media session descriptions. |
29 | 29 |
30 #ifndef TALK_SESSION_MEDIA_MEDIASESSION_H_ | 30 #ifndef TALK_SESSION_MEDIA_MEDIASESSION_H_ |
31 #define TALK_SESSION_MEDIA_MEDIASESSION_H_ | 31 #define TALK_SESSION_MEDIA_MEDIASESSION_H_ |
32 | 32 |
33 #include <algorithm> | 33 #include <algorithm> |
34 #include <string> | 34 #include <string> |
35 #include <vector> | 35 #include <vector> |
36 | 36 |
37 #include "talk/media/base/codec.h" | 37 #include "webrtc/base/scoped_ptr.h" |
38 #include "talk/media/base/constants.h" | 38 #include "webrtc/media/base/codec.h" |
39 #include "talk/media/base/cryptoparams.h" | 39 #include "webrtc/media/base/constants.h" |
40 #include "talk/media/base/mediachannel.h" | 40 #include "webrtc/media/base/cryptoparams.h" |
41 #include "talk/media/base/mediaengine.h" // For DataChannelType | 41 #include "webrtc/media/base/mediachannel.h" |
42 #include "talk/media/base/streamparams.h" | 42 #include "webrtc/media/base/mediaengine.h" // For DataChannelType |
| 43 #include "webrtc/media/base/streamparams.h" |
43 #include "webrtc/p2p/base/sessiondescription.h" | 44 #include "webrtc/p2p/base/sessiondescription.h" |
44 #include "webrtc/p2p/base/transport.h" | 45 #include "webrtc/p2p/base/transport.h" |
45 #include "webrtc/p2p/base/transportdescriptionfactory.h" | 46 #include "webrtc/p2p/base/transportdescriptionfactory.h" |
46 #include "webrtc/base/scoped_ptr.h" | |
47 | 47 |
48 namespace cricket { | 48 namespace cricket { |
49 | 49 |
50 class ChannelManager; | 50 class ChannelManager; |
51 typedef std::vector<AudioCodec> AudioCodecs; | 51 typedef std::vector<AudioCodec> AudioCodecs; |
52 typedef std::vector<VideoCodec> VideoCodecs; | 52 typedef std::vector<VideoCodec> VideoCodecs; |
53 typedef std::vector<DataCodec> DataCodecs; | 53 typedef std::vector<DataCodec> DataCodecs; |
54 typedef std::vector<CryptoParams> CryptoParamsVec; | 54 typedef std::vector<CryptoParams> CryptoParamsVec; |
55 typedef std::vector<RtpHeaderExtension> RtpHeaderExtensions; | 55 typedef std::vector<RtpHeaderExtension> RtpHeaderExtensions; |
56 | 56 |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 void GetSupportedVideoCryptoSuiteNames( | 558 void GetSupportedVideoCryptoSuiteNames( |
559 std::vector<std::string>* crypto_suite_names); | 559 std::vector<std::string>* crypto_suite_names); |
560 void GetSupportedDataCryptoSuiteNames( | 560 void GetSupportedDataCryptoSuiteNames( |
561 std::vector<std::string>* crypto_suite_names); | 561 std::vector<std::string>* crypto_suite_names); |
562 void GetDefaultSrtpCryptoSuiteNames( | 562 void GetDefaultSrtpCryptoSuiteNames( |
563 std::vector<std::string>* crypto_suite_names); | 563 std::vector<std::string>* crypto_suite_names); |
564 | 564 |
565 } // namespace cricket | 565 } // namespace cricket |
566 | 566 |
567 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_ | 567 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_ |
OLD | NEW |