Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2016 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 #import <WebRTC/RTCMacros.h> | 13 #import <WebRTC/RTCMacros.h> |
| 14 #import <WebRTC/RTCMediaStreamTrack.h> | 14 #import <WebRTC/RTCMediaStreamTrack.h> |
| 15 #import <WebRTC/RTCRtpParameters.h> | 15 #import <WebRTC/RTCRtpParameters.h> |
| 16 | 16 |
| 17 NS_ASSUME_NONNULL_BEGIN | 17 NS_ASSUME_NONNULL_BEGIN |
| 18 | 18 |
| 19 RTC_EXPORT | 19 RTC_EXPORT |
| 20 @protocol RTCRtpSender <NSObject> | 20 @protocol RTCRtpSender <NSObject> |
| 21 | 21 |
| 22 /** A unique identifier for this sender. */ | |
| 23 @property(nonatomic, readonly) NSString *senderId; | |
| 24 | |
| 22 /** The currently active RTCRtpParameters, as defined in | 25 /** The currently active RTCRtpParameters, as defined in |
| 23 * https://www.w3.org/TR/webrtc/#idl-def-RTCRtpParameters. | 26 * https://www.w3.org/TR/webrtc/#idl-def-RTCRtpParameters. |
| 24 */ | 27 */ |
| 25 @property(nonatomic, readonly) RTCRtpParameters *parameters; | 28 @property(nonatomic) RTCRtpParameters *parameters; |
|
tkchin_webrtc
2016/04/27 20:22:20
nit: nonatomic, copy?
skvlad
2016/04/27 23:00:58
Good catch, copy is the right thing here.
| |
| 26 | 29 |
| 27 /** The RTCMediaStreamTrack associated with the sender. | 30 /** The RTCMediaStreamTrack associated with the sender. |
| 28 * Note: reading this property returns a new instance of | 31 * Note: reading this property returns a new instance of |
| 29 * RTCMediaStreamTrack. Use isEqual: instead of == to compare | 32 * RTCMediaStreamTrack. Use isEqual: instead of == to compare |
| 30 * RTCMediaStreamTrack instances. | 33 * RTCMediaStreamTrack instances. |
| 31 */ | 34 */ |
| 32 @property(nonatomic, readonly) RTCMediaStreamTrack *track; | 35 @property(nonatomic) RTCMediaStreamTrack *track; |
|
tkchin_webrtc
2016/04/27 20:22:20
I'm surprised this wasn't throwing a warning - thi
skvlad
2016/04/27 23:00:58
Is "copy" the right annotation for the behavior we
tkchin_webrtc
2016/04/27 23:13:43
Sort-of. Since we are overriding the setter these
| |
| 33 | |
| 34 /** Set the new RTCRtpParameters to be used by the sender. | |
| 35 * Returns YES if the new parameters were applied, NO otherwise. | |
| 36 */ | |
| 37 - (BOOL)setParameters:(RTCRtpParameters *)parameters; | |
| 38 | 36 |
| 39 @end | 37 @end |
| 40 | 38 |
| 41 RTC_EXPORT | 39 RTC_EXPORT |
| 42 @interface RTCRtpSender : NSObject <RTCRtpSender> | 40 @interface RTCRtpSender : NSObject <RTCRtpSender> |
| 43 | 41 |
| 44 - (instancetype)init NS_UNAVAILABLE; | 42 - (instancetype)init NS_UNAVAILABLE; |
| 45 | 43 |
| 46 @end | 44 @end |
| 47 | 45 |
| 48 NS_ASSUME_NONNULL_END | 46 NS_ASSUME_NONNULL_END |
| OLD | NEW |