| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 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 |
| 11 #import <Foundation/Foundation.h> | 11 #import <Foundation/Foundation.h> |
| 12 | 12 |
| 13 @class RTCIceServer; | 13 @class RTCIceServer; |
| 14 | 14 |
| 15 // TODO(hjon): Update nullability types. See http://crbug/webrtc/5592 |
| 16 |
| 15 /** | 17 /** |
| 16 * Represents the ice transport policy. This exposes the same states in C++, | 18 * Represents the ice transport policy. This exposes the same states in C++, |
| 17 * which include one more state than what exists in the W3C spec. | 19 * which include one more state than what exists in the W3C spec. |
| 18 */ | 20 */ |
| 19 typedef NS_ENUM(NSInteger, RTCIceTransportPolicy) { | 21 typedef NS_ENUM(NSInteger, RTCIceTransportPolicy) { |
| 20 RTCIceTransportPolicyNone, | 22 RTCIceTransportPolicyNone, |
| 21 RTCIceTransportPolicyRelay, | 23 RTCIceTransportPolicyRelay, |
| 22 RTCIceTransportPolicyNoHost, | 24 RTCIceTransportPolicyNoHost, |
| 23 RTCIceTransportPolicyAll | 25 RTCIceTransportPolicyAll |
| 24 }; | 26 }; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 46 typedef NS_ENUM(NSInteger, RTCEncryptionKeyType) { | 48 typedef NS_ENUM(NSInteger, RTCEncryptionKeyType) { |
| 47 RTCEncryptionKeyTypeRSA, | 49 RTCEncryptionKeyTypeRSA, |
| 48 RTCEncryptionKeyTypeECDSA, | 50 RTCEncryptionKeyTypeECDSA, |
| 49 }; | 51 }; |
| 50 | 52 |
| 51 NS_ASSUME_NONNULL_BEGIN | 53 NS_ASSUME_NONNULL_BEGIN |
| 52 | 54 |
| 53 @interface RTCConfiguration : NSObject | 55 @interface RTCConfiguration : NSObject |
| 54 | 56 |
| 55 /** An array of Ice Servers available to be used by ICE. */ | 57 /** An array of Ice Servers available to be used by ICE. */ |
| 56 @property(nonatomic, copy) NSArray<RTCIceServer *> *iceServers; | 58 @property(nonatomic, copy, nonnull) NSArray *iceServers; |
| 59 // @property(nonatomic, copy) NSArray<RTCIceServer *> *iceServers; |
| 57 | 60 |
| 58 /** Which candidates the ICE agent is allowed to use. The W3C calls it | 61 /** Which candidates the ICE agent is allowed to use. The W3C calls it |
| 59 * |iceTransportPolicy|, while in C++ it is called |type|. */ | 62 * |iceTransportPolicy|, while in C++ it is called |type|. */ |
| 60 @property(nonatomic, assign) RTCIceTransportPolicy iceTransportPolicy; | 63 @property(nonatomic, assign) RTCIceTransportPolicy iceTransportPolicy; |
| 61 | 64 |
| 62 /** The media-bundling policy to use when gathering ICE candidates. */ | 65 /** The media-bundling policy to use when gathering ICE candidates. */ |
| 63 @property(nonatomic, assign) RTCBundlePolicy bundlePolicy; | 66 @property(nonatomic, assign) RTCBundlePolicy bundlePolicy; |
| 64 | 67 |
| 65 /** The rtcp-mux policy to use when gathering ICE candidates. */ | 68 /** The rtcp-mux policy to use when gathering ICE candidates. */ |
| 66 @property(nonatomic, assign) RTCRtcpMuxPolicy rtcpMuxPolicy; | 69 @property(nonatomic, assign) RTCRtcpMuxPolicy rtcpMuxPolicy; |
| 67 @property(nonatomic, assign) RTCTcpCandidatePolicy tcpCandidatePolicy; | 70 @property(nonatomic, assign) RTCTcpCandidatePolicy tcpCandidatePolicy; |
| 68 @property(nonatomic, assign) int audioJitterBufferMaxPackets; | 71 @property(nonatomic, assign) int audioJitterBufferMaxPackets; |
| 69 @property(nonatomic, assign) int iceConnectionReceivingTimeout; | 72 @property(nonatomic, assign) int iceConnectionReceivingTimeout; |
| 70 @property(nonatomic, assign) int iceBackupCandidatePairPingInterval; | 73 @property(nonatomic, assign) int iceBackupCandidatePairPingInterval; |
| 71 | 74 |
| 72 /** Key type used to generate SSL identity. Default is ECDSA. */ | 75 /** Key type used to generate SSL identity. Default is ECDSA. */ |
| 73 @property(nonatomic, assign) RTCEncryptionKeyType keyType; | 76 @property(nonatomic, assign) RTCEncryptionKeyType keyType; |
| 74 | 77 |
| 75 - (instancetype)init NS_DESIGNATED_INITIALIZER; | 78 - (nonnull instancetype)init NS_DESIGNATED_INITIALIZER; |
| 76 | 79 |
| 77 @end | 80 @end |
| 78 | 81 |
| 79 NS_ASSUME_NONNULL_END | 82 NS_ASSUME_NONNULL_END |
| OLD | NEW |