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 "RTCMediaSource.h" | 11 #import "RTCMediaSource.h" |
12 | 12 |
13 #include "talk/app/webrtc/mediastreaminterface.h" | 13 #include "talk/app/webrtc/mediastreaminterface.h" |
14 #include "talk/app/webrtc/videosourceinterface.h" | |
14 | 15 |
15 NS_ASSUME_NONNULL_BEGIN | 16 NS_ASSUME_NONNULL_BEGIN |
16 | 17 |
17 @interface RTCMediaSource () | 18 @interface RTCMediaSource () |
18 | 19 |
19 /** | 20 /** |
20 * The MediaSourceInterface object passed to this RTCMediaSource during | 21 * The MediaSourceInterface object passed to this RTCMediaSource during |
21 * construction. | 22 * construction. |
22 */ | 23 */ |
23 @property(nonatomic, readonly) | 24 @property(nonatomic, readonly) |
24 rtc::scoped_refptr<webrtc::MediaSourceInterface> nativeMediaSource; | 25 rtc::scoped_refptr<webrtc::MediaSourceInterface> nativeMediaSource; |
25 | 26 |
26 /** Initialize an RTCMediaSource from a native MediaSourceInterface. */ | 27 /** |
27 - (instancetype)initWithNativeMediaSource: | 28 * If this is an RTCVideoSource instance, the VideoSourceInterface object passed |
28 (rtc::scoped_refptr<webrtc::MediaSourceInterface>)nativeMediaSource | 29 * in during construction. |
29 NS_DESIGNATED_INITIALIZER; | 30 */ |
31 @property(nonatomic, readonly) | |
32 rtc::scoped_refptr<webrtc::VideoSourceInterface> nativeVideoSource; | |
tkchin_webrtc
2016/01/13 02:26:27
this shouldn't be here - only in RTCVideoSource
hjon
2016/01/13 18:07:00
Done.
| |
30 | 33 |
31 + (webrtc::MediaSourceInterface::SourceState)nativeSourceStateForState: | 34 + (webrtc::MediaSourceInterface::SourceState)nativeSourceStateForState: |
32 (RTCSourceState)state; | 35 (RTCSourceState)state; |
33 | 36 |
34 + (RTCSourceState)sourceStateForNativeState: | 37 + (RTCSourceState)sourceStateForNativeState: |
35 (webrtc::MediaSourceInterface::SourceState)nativeState; | 38 (webrtc::MediaSourceInterface::SourceState)nativeState; |
36 | 39 |
37 + (NSString *)stringForState:(RTCSourceState)state; | 40 + (NSString *)stringForState:(RTCSourceState)state; |
38 | 41 |
39 @end | 42 @end |
40 | 43 |
41 NS_ASSUME_NONNULL_END | 44 NS_ASSUME_NONNULL_END |
OLD | NEW |