OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 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 17 matching lines...) Expand all Loading... | |
28 #include "webrtc/p2p/base/transport.h" | 28 #include "webrtc/p2p/base/transport.h" |
29 #include "webrtc/p2p/base/transportdescriptionfactory.h" | 29 #include "webrtc/p2p/base/transportdescriptionfactory.h" |
30 | 30 |
31 namespace cricket { | 31 namespace cricket { |
32 | 32 |
33 class ChannelManager; | 33 class ChannelManager; |
34 typedef std::vector<AudioCodec> AudioCodecs; | 34 typedef std::vector<AudioCodec> AudioCodecs; |
35 typedef std::vector<VideoCodec> VideoCodecs; | 35 typedef std::vector<VideoCodec> VideoCodecs; |
36 typedef std::vector<DataCodec> DataCodecs; | 36 typedef std::vector<DataCodec> DataCodecs; |
37 typedef std::vector<CryptoParams> CryptoParamsVec; | 37 typedef std::vector<CryptoParams> CryptoParamsVec; |
38 typedef std::vector<RtpHeaderExtension> RtpHeaderExtensions; | 38 typedef std::vector<webrtc::RtpExtension> RtpHeaderExtensions; |
the sun
2016/05/30 16:00:17
Is this actually used anywhere? ...
| |
39 | 39 |
40 enum MediaType { | 40 enum MediaType { |
41 MEDIA_TYPE_AUDIO, | 41 MEDIA_TYPE_AUDIO, |
42 MEDIA_TYPE_VIDEO, | 42 MEDIA_TYPE_VIDEO, |
43 MEDIA_TYPE_DATA | 43 MEDIA_TYPE_DATA |
44 }; | 44 }; |
45 | 45 |
46 std::string MediaTypeToString(MediaType type); | 46 std::string MediaTypeToString(MediaType type); |
47 | 47 |
48 enum MediaContentDirection { | 48 enum MediaContentDirection { |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
198 crypto_required_ = type; | 198 crypto_required_ = type; |
199 } | 199 } |
200 | 200 |
201 const RtpHeaderExtensions& rtp_header_extensions() const { | 201 const RtpHeaderExtensions& rtp_header_extensions() const { |
202 return rtp_header_extensions_; | 202 return rtp_header_extensions_; |
203 } | 203 } |
204 void set_rtp_header_extensions(const RtpHeaderExtensions& extensions) { | 204 void set_rtp_header_extensions(const RtpHeaderExtensions& extensions) { |
205 rtp_header_extensions_ = extensions; | 205 rtp_header_extensions_ = extensions; |
206 rtp_header_extensions_set_ = true; | 206 rtp_header_extensions_set_ = true; |
207 } | 207 } |
208 void AddRtpHeaderExtension(const RtpHeaderExtension& ext) { | 208 void AddRtpHeaderExtension(const webrtc::RtpExtension& ext) { |
209 rtp_header_extensions_.push_back(ext); | 209 rtp_header_extensions_.push_back(ext); |
210 rtp_header_extensions_set_ = true; | 210 rtp_header_extensions_set_ = true; |
211 } | 211 } |
212 void ClearRtpHeaderExtensions() { | 212 void ClearRtpHeaderExtensions() { |
213 rtp_header_extensions_.clear(); | 213 rtp_header_extensions_.clear(); |
214 rtp_header_extensions_set_ = true; | 214 rtp_header_extensions_set_ = true; |
215 } | 215 } |
216 // We can't always tell if an empty list of header extensions is | 216 // We can't always tell if an empty list of header extensions is |
217 // because the other side doesn't support them, or just isn't hooked up to | 217 // because the other side doesn't support them, or just isn't hooked up to |
218 // signal them. For now we assume an empty list means no signaling, but | 218 // signal them. For now we assume an empty list means no signaling, but |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
277 } | 277 } |
278 int buffered_mode_latency() const { return buffered_mode_latency_; } | 278 int buffered_mode_latency() const { return buffered_mode_latency_; } |
279 | 279 |
280 protected: | 280 protected: |
281 bool rtcp_mux_ = false; | 281 bool rtcp_mux_ = false; |
282 bool rtcp_reduced_size_ = false; | 282 bool rtcp_reduced_size_ = false; |
283 int bandwidth_ = kAutoBandwidth; | 283 int bandwidth_ = kAutoBandwidth; |
284 std::string protocol_; | 284 std::string protocol_; |
285 std::vector<CryptoParams> cryptos_; | 285 std::vector<CryptoParams> cryptos_; |
286 CryptoType crypto_required_ = CT_NONE; | 286 CryptoType crypto_required_ = CT_NONE; |
287 std::vector<RtpHeaderExtension> rtp_header_extensions_; | 287 std::vector<webrtc::RtpExtension> rtp_header_extensions_; |
the sun
2016/05/30 16:00:17
...it could be used here.
| |
288 bool rtp_header_extensions_set_ = false; | 288 bool rtp_header_extensions_set_ = false; |
289 bool multistream_ = false; | 289 bool multistream_ = false; |
290 StreamParamsVec streams_; | 290 StreamParamsVec streams_; |
291 bool conference_mode_ = false; | 291 bool conference_mode_ = false; |
292 bool partial_ = false; | 292 bool partial_ = false; |
293 int buffered_mode_latency_ = kBufferedModeDisabled; | 293 int buffered_mode_latency_ = kBufferedModeDisabled; |
294 MediaContentDirection direction_ = MD_SENDRECV; | 294 MediaContentDirection direction_ = MD_SENDRECV; |
295 }; | 295 }; |
296 | 296 |
297 template <class C> | 297 template <class C> |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
557 void GetSupportedVideoCryptoSuiteNames( | 557 void GetSupportedVideoCryptoSuiteNames( |
558 std::vector<std::string>* crypto_suite_names); | 558 std::vector<std::string>* crypto_suite_names); |
559 void GetSupportedDataCryptoSuiteNames( | 559 void GetSupportedDataCryptoSuiteNames( |
560 std::vector<std::string>* crypto_suite_names); | 560 std::vector<std::string>* crypto_suite_names); |
561 void GetDefaultSrtpCryptoSuiteNames( | 561 void GetDefaultSrtpCryptoSuiteNames( |
562 std::vector<std::string>* crypto_suite_names); | 562 std::vector<std::string>* crypto_suite_names); |
563 | 563 |
564 } // namespace cricket | 564 } // namespace cricket |
565 | 565 |
566 #endif // WEBRTC_PC_MEDIASESSION_H_ | 566 #endif // WEBRTC_PC_MEDIASESSION_H_ |
OLD | NEW |