Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: webrtc/api/objc/RTCConfiguration.h

Issue 1773743002: Restore type attributes and remove extraneous nullability annotations for Objective-C Mac build (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/api/objc/RTCIceCandidate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
17 /** 15 /**
18 * Represents the ice transport policy. This exposes the same states in C++, 16 * Represents the ice transport policy. This exposes the same states in C++,
19 * which include one more state than what exists in the W3C spec. 17 * which include one more state than what exists in the W3C spec.
20 */ 18 */
21 typedef NS_ENUM(NSInteger, RTCIceTransportPolicy) { 19 typedef NS_ENUM(NSInteger, RTCIceTransportPolicy) {
22 RTCIceTransportPolicyNone, 20 RTCIceTransportPolicyNone,
23 RTCIceTransportPolicyRelay, 21 RTCIceTransportPolicyRelay,
24 RTCIceTransportPolicyNoHost, 22 RTCIceTransportPolicyNoHost,
25 RTCIceTransportPolicyAll 23 RTCIceTransportPolicyAll
26 }; 24 };
(...skipping 21 matching lines...) Expand all
48 typedef NS_ENUM(NSInteger, RTCEncryptionKeyType) { 46 typedef NS_ENUM(NSInteger, RTCEncryptionKeyType) {
49 RTCEncryptionKeyTypeRSA, 47 RTCEncryptionKeyTypeRSA,
50 RTCEncryptionKeyTypeECDSA, 48 RTCEncryptionKeyTypeECDSA,
51 }; 49 };
52 50
53 NS_ASSUME_NONNULL_BEGIN 51 NS_ASSUME_NONNULL_BEGIN
54 52
55 @interface RTCConfiguration : NSObject 53 @interface RTCConfiguration : NSObject
56 54
57 /** An array of Ice Servers available to be used by ICE. */ 55 /** An array of Ice Servers available to be used by ICE. */
58 @property(nonatomic, copy, nonnull) NSArray *iceServers; 56 @property(nonatomic, copy) NSArray<RTCIceServer *> *iceServers;
59 // @property(nonatomic, copy) NSArray<RTCIceServer *> *iceServers;
60 57
61 /** Which candidates the ICE agent is allowed to use. The W3C calls it 58 /** Which candidates the ICE agent is allowed to use. The W3C calls it
62 * |iceTransportPolicy|, while in C++ it is called |type|. */ 59 * |iceTransportPolicy|, while in C++ it is called |type|. */
63 @property(nonatomic, assign) RTCIceTransportPolicy iceTransportPolicy; 60 @property(nonatomic, assign) RTCIceTransportPolicy iceTransportPolicy;
64 61
65 /** The media-bundling policy to use when gathering ICE candidates. */ 62 /** The media-bundling policy to use when gathering ICE candidates. */
66 @property(nonatomic, assign) RTCBundlePolicy bundlePolicy; 63 @property(nonatomic, assign) RTCBundlePolicy bundlePolicy;
67 64
68 /** The rtcp-mux policy to use when gathering ICE candidates. */ 65 /** The rtcp-mux policy to use when gathering ICE candidates. */
69 @property(nonatomic, assign) RTCRtcpMuxPolicy rtcpMuxPolicy; 66 @property(nonatomic, assign) RTCRtcpMuxPolicy rtcpMuxPolicy;
70 @property(nonatomic, assign) RTCTcpCandidatePolicy tcpCandidatePolicy; 67 @property(nonatomic, assign) RTCTcpCandidatePolicy tcpCandidatePolicy;
71 @property(nonatomic, assign) int audioJitterBufferMaxPackets; 68 @property(nonatomic, assign) int audioJitterBufferMaxPackets;
72 @property(nonatomic, assign) int iceConnectionReceivingTimeout; 69 @property(nonatomic, assign) int iceConnectionReceivingTimeout;
73 @property(nonatomic, assign) int iceBackupCandidatePairPingInterval; 70 @property(nonatomic, assign) int iceBackupCandidatePairPingInterval;
74 71
75 /** Key type used to generate SSL identity. Default is ECDSA. */ 72 /** Key type used to generate SSL identity. Default is ECDSA. */
76 @property(nonatomic, assign) RTCEncryptionKeyType keyType; 73 @property(nonatomic, assign) RTCEncryptionKeyType keyType;
77 74
78 - (nonnull instancetype)init NS_DESIGNATED_INITIALIZER; 75 - (instancetype)init NS_DESIGNATED_INITIALIZER;
79 76
80 @end 77 @end
81 78
82 NS_ASSUME_NONNULL_END 79 NS_ASSUME_NONNULL_END
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/objc/RTCIceCandidate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698