OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
63 #include "webrtc/api/mediastreaminterface.h" | 63 #include "webrtc/api/mediastreaminterface.h" |
64 #include "webrtc/api/rtpreceiverinterface.h" | 64 #include "webrtc/api/rtpreceiverinterface.h" |
65 #include "webrtc/api/rtpsenderinterface.h" | 65 #include "webrtc/api/rtpsenderinterface.h" |
66 #include "webrtc/api/statstypes.h" | 66 #include "webrtc/api/statstypes.h" |
67 #include "webrtc/api/umametrics.h" | 67 #include "webrtc/api/umametrics.h" |
68 #include "webrtc/base/fileutils.h" | 68 #include "webrtc/base/fileutils.h" |
69 #include "webrtc/base/network.h" | 69 #include "webrtc/base/network.h" |
70 #include "webrtc/base/rtccertificate.h" | 70 #include "webrtc/base/rtccertificate.h" |
71 #include "webrtc/base/socketaddress.h" | 71 #include "webrtc/base/socketaddress.h" |
72 #include "webrtc/base/sslstreamadapter.h" | 72 #include "webrtc/base/sslstreamadapter.h" |
73 #include "webrtc/media/base/mediachannel.h" | |
73 #include "webrtc/p2p/base/portallocator.h" | 74 #include "webrtc/p2p/base/portallocator.h" |
74 | 75 |
75 namespace rtc { | 76 namespace rtc { |
76 class SSLIdentity; | 77 class SSLIdentity; |
77 class Thread; | 78 class Thread; |
78 } | 79 } |
79 | 80 |
80 namespace cricket { | 81 namespace cricket { |
81 class WebRtcVideoDecoderFactory; | 82 class WebRtcVideoDecoderFactory; |
82 class WebRtcVideoEncoderFactory; | 83 class WebRtcVideoEncoderFactory; |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
234 IceServers servers; | 235 IceServers servers; |
235 BundlePolicy bundle_policy; | 236 BundlePolicy bundle_policy; |
236 RtcpMuxPolicy rtcp_mux_policy; | 237 RtcpMuxPolicy rtcp_mux_policy; |
237 TcpCandidatePolicy tcp_candidate_policy; | 238 TcpCandidatePolicy tcp_candidate_policy; |
238 int audio_jitter_buffer_max_packets; | 239 int audio_jitter_buffer_max_packets; |
239 bool audio_jitter_buffer_fast_accelerate; | 240 bool audio_jitter_buffer_fast_accelerate; |
240 int ice_connection_receiving_timeout; // ms | 241 int ice_connection_receiving_timeout; // ms |
241 int ice_backup_candidate_pair_ping_interval; // ms | 242 int ice_backup_candidate_pair_ping_interval; // ms |
242 ContinualGatheringPolicy continual_gathering_policy; | 243 ContinualGatheringPolicy continual_gathering_policy; |
243 std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates; | 244 std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates; |
244 bool disable_prerenderer_smoothing; | |
245 bool prioritize_most_likely_ice_candidate_pairs; | 245 bool prioritize_most_likely_ice_candidate_pairs; |
246 struct cricket::MediaConfig media_config; | |
perkj_webrtc
2016/03/22 08:31:25
Doesn't this change break chrome and other clients
| |
246 // Flags corresponding to values set by constraint flags. | 247 // Flags corresponding to values set by constraint flags. |
247 // rtc::Optional flags can be "missing", in which case the webrtc | 248 // rtc::Optional flags can be "missing", in which case the webrtc |
248 // default applies. | 249 // default applies. |
249 bool disable_ipv6; | 250 bool disable_ipv6; |
250 rtc::Optional<bool> enable_dscp; | |
251 bool enable_rtp_data_channel; | 251 bool enable_rtp_data_channel; |
252 rtc::Optional<bool> cpu_overuse_detection; | |
253 rtc::Optional<bool> suspend_below_min_bitrate; | |
254 rtc::Optional<int> screencast_min_bitrate; | 252 rtc::Optional<int> screencast_min_bitrate; |
255 rtc::Optional<bool> combined_audio_video_bwe; | 253 rtc::Optional<bool> combined_audio_video_bwe; |
256 rtc::Optional<bool> enable_dtls_srtp; | 254 rtc::Optional<bool> enable_dtls_srtp; |
257 RTCConfiguration() | 255 RTCConfiguration() |
258 : type(kAll), | 256 : type(kAll), |
259 bundle_policy(kBundlePolicyBalanced), | 257 bundle_policy(kBundlePolicyBalanced), |
260 rtcp_mux_policy(kRtcpMuxPolicyNegotiate), | 258 rtcp_mux_policy(kRtcpMuxPolicyNegotiate), |
261 tcp_candidate_policy(kTcpCandidatePolicyEnabled), | 259 tcp_candidate_policy(kTcpCandidatePolicyEnabled), |
262 audio_jitter_buffer_max_packets(kAudioJitterBufferMaxPackets), | 260 audio_jitter_buffer_max_packets(kAudioJitterBufferMaxPackets), |
263 audio_jitter_buffer_fast_accelerate(false), | 261 audio_jitter_buffer_fast_accelerate(false), |
264 ice_connection_receiving_timeout(kUndefined), | 262 ice_connection_receiving_timeout(kUndefined), |
265 ice_backup_candidate_pair_ping_interval(kUndefined), | 263 ice_backup_candidate_pair_ping_interval(kUndefined), |
266 continual_gathering_policy(GATHER_ONCE), | 264 continual_gathering_policy(GATHER_ONCE), |
267 disable_prerenderer_smoothing(false), | |
268 prioritize_most_likely_ice_candidate_pairs(false), | 265 prioritize_most_likely_ice_candidate_pairs(false), |
269 disable_ipv6(false), | 266 disable_ipv6(false), |
270 enable_rtp_data_channel(false) {} | 267 enable_rtp_data_channel(false) {} |
271 }; | 268 }; |
272 | 269 |
273 struct RTCOfferAnswerOptions { | 270 struct RTCOfferAnswerOptions { |
274 static const int kUndefined = -1; | 271 static const int kUndefined = -1; |
275 static const int kMaxOfferToReceiveMedia = 1; | 272 static const int kMaxOfferToReceiveMedia = 1; |
276 | 273 |
277 // The default value for constraint offerToReceiveX:true. | 274 // The default value for constraint offerToReceiveX:true. |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
644 CreatePeerConnectionFactory( | 641 CreatePeerConnectionFactory( |
645 rtc::Thread* worker_thread, | 642 rtc::Thread* worker_thread, |
646 rtc::Thread* signaling_thread, | 643 rtc::Thread* signaling_thread, |
647 AudioDeviceModule* default_adm, | 644 AudioDeviceModule* default_adm, |
648 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 645 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
649 cricket::WebRtcVideoDecoderFactory* decoder_factory); | 646 cricket::WebRtcVideoDecoderFactory* decoder_factory); |
650 | 647 |
651 } // namespace webrtc | 648 } // namespace webrtc |
652 | 649 |
653 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 650 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
OLD | NEW |