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

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

Issue 1696673003: Tweaks for new Objective-C API. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Couple more tweaks after updating against master 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
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
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 /** The object that will be notifed about events such as state changes and 106 /** The object that will be notifed about events such as state changes and
107 * streams being added or removed. 107 * streams being added or removed.
108 */ 108 */
109 @property(nonatomic, weak, nullable) id<RTCPeerConnectionDelegate> delegate; 109 @property(nonatomic, weak, nullable) id<RTCPeerConnectionDelegate> delegate;
110 @property(nonatomic, readonly, nonnull) NSArray *localStreams; 110 @property(nonatomic, readonly, nonnull) NSArray *localStreams;
111 @property(nonatomic, readonly, nullable) 111 @property(nonatomic, readonly, nullable)
112 RTCSessionDescription *localDescription; 112 RTCSessionDescription *localDescription;
113 @property(nonatomic, readonly, nullable) 113 @property(nonatomic, readonly, nullable)
114 RTCSessionDescription *remoteDescription; 114 RTCSessionDescription *remoteDescription;
115 @property(nonatomic, readonly) RTCSignalingState signalingState; 115 @property(nonatomic, assign, readonly) RTCSignalingState signalingState;
tkchin_webrtc 2016/02/26 00:45:25 ditto no assign + readonly
116 @property(nonatomic, readonly) RTCIceConnectionState iceConnectionState; 116 @property(nonatomic, assign, readonly) RTCIceConnectionState iceConnectionState;
117 @property(nonatomic, readonly) RTCIceGatheringState iceGatheringState; 117 @property(nonatomic, assign, readonly) RTCIceGatheringState iceGatheringState;
118 118
119 - (nonnull instancetype)init NS_UNAVAILABLE; 119 - (nonnull instancetype)init NS_UNAVAILABLE;
120 120
121 /** Initialize an RTCPeerConnection with a configuration, constraints, and 121 /** Initialize an RTCPeerConnection with a configuration, constraints, and
122 * delegate. 122 * delegate.
123 */ 123 */
124 - (nonnull instancetype)initWithFactory: 124 - (nonnull instancetype)initWithFactory:
125 (nonnull RTCPeerConnectionFactory *)factory 125 (nonnull RTCPeerConnectionFactory *)factory
126 configuration: 126 configuration:
127 (nonnull RTCConfiguration *)configuration 127 (nonnull RTCConfiguration *)configuration
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 configuration:(nonnull RTCDataChannelConfiguration *)configuration; 174 configuration:(nonnull RTCDataChannelConfiguration *)configuration;
175 175
176 @end 176 @end
177 177
178 @interface RTCPeerConnection (Stats) 178 @interface RTCPeerConnection (Stats)
179 179
180 /** Gather stats for the given RTCMediaStreamTrack. If |mediaStreamTrack| is nil 180 /** Gather stats for the given RTCMediaStreamTrack. If |mediaStreamTrack| is nil
181 * statistics are gathered for all tracks. 181 * statistics are gathered for all tracks.
182 */ 182 */
183 - (void)statsForTrack: 183 - (void)statsForTrack:
184 (nonnull RTCMediaStreamTrack *)mediaStreamTrack 184 (nullable RTCMediaStreamTrack *)mediaStreamTrack
185 statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel 185 statsOutputLevel:(RTCStatsOutputLevel)statsOutputLevel
186 completionHandler: 186 completionHandler:
187 (nullable void (^)(NSArray * _Nonnull stats))completionHandler; 187 (nullable void (^)(NSArray * _Nonnull stats))completionHandler;
188 // (nullable void (^)(NSArray<RTCStatsReport *> *stats))completionHandler; 188 // (nullable void (^)(NSArray<RTCStatsReport *> *stats))completionHandler;
189 189
190 @end 190 @end
191 191
192 NS_ASSUME_NONNULL_END 192 NS_ASSUME_NONNULL_END
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698