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 NS_ASSUME_NONNULL_BEGIN | 13 NS_ASSUME_NONNULL_BEGIN |
| 14 // TODO(hjon): Update nullability types. See http://crbug/webrtc/5592 |
14 | 15 |
15 @class RTCAudioTrack; | 16 @class RTCAudioTrack; |
16 @class RTCVideoTrack; | 17 @class RTCVideoTrack; |
17 | 18 |
18 @interface RTCMediaStream : NSObject | 19 @interface RTCMediaStream : NSObject |
19 | 20 |
20 /** The audio tracks in this stream. */ | 21 /** The audio tracks in this stream. */ |
21 @property(nonatomic, strong, readonly) NSArray<RTCAudioTrack *> *audioTracks; | 22 @property(nonatomic, strong, readonly) NSArray *audioTracks; |
| 23 // @property(nonatomic, strong, readonly) NSArray<RTCAudioTrack *> *audioTracks; |
22 | 24 |
23 /** The video tracks in this stream. */ | 25 /** The video tracks in this stream. */ |
24 @property(nonatomic, strong, readonly) NSArray<RTCVideoTrack *> *videoTracks; | 26 @property(nonatomic, strong, readonly) NSArray *videoTracks; |
| 27 // @property(nonatomic, strong, readonly) NSArray<RTCVideoTrack *> *videoTracks; |
25 | 28 |
26 /** An identifier for this media stream. */ | 29 /** An identifier for this media stream. */ |
27 @property(nonatomic, readonly) NSString *streamId; | 30 @property(nonatomic, readonly) NSString *streamId; |
28 | 31 |
29 - (instancetype)init NS_UNAVAILABLE; | 32 - (instancetype)init NS_UNAVAILABLE; |
30 | 33 |
31 /** Adds the given audio track to this media stream. */ | 34 /** Adds the given audio track to this media stream. */ |
32 - (void)addAudioTrack:(RTCAudioTrack *)audioTrack; | 35 - (void)addAudioTrack:(RTCAudioTrack *)audioTrack; |
33 | 36 |
34 /** Adds the given video track to this media stream. */ | 37 /** Adds the given video track to this media stream. */ |
35 - (void)addVideoTrack:(RTCVideoTrack *)videoTrack; | 38 - (void)addVideoTrack:(RTCVideoTrack *)videoTrack; |
36 | 39 |
37 /** Removes the given audio track to this media stream. */ | 40 /** Removes the given audio track to this media stream. */ |
38 - (void)removeAudioTrack:(RTCAudioTrack *)audioTrack; | 41 - (void)removeAudioTrack:(RTCAudioTrack *)audioTrack; |
39 | 42 |
40 /** Removes the given video track to this media stream. */ | 43 /** Removes the given video track to this media stream. */ |
41 - (void)removeVideoTrack:(RTCVideoTrack *)videoTrack; | 44 - (void)removeVideoTrack:(RTCVideoTrack *)videoTrack; |
42 | 45 |
43 @end | 46 @end |
44 | 47 |
45 NS_ASSUME_NONNULL_END | 48 NS_ASSUME_NONNULL_END |
OLD | NEW |