| Index: webrtc/sdk/objc/Framework/Classes/RTCMediaSource+Private.h
|
| diff --git a/webrtc/sdk/objc/Framework/Classes/RTCVideoSource+Private.h b/webrtc/sdk/objc/Framework/Classes/RTCMediaSource+Private.h
|
| similarity index 60%
|
| copy from webrtc/sdk/objc/Framework/Classes/RTCVideoSource+Private.h
|
| copy to webrtc/sdk/objc/Framework/Classes/RTCMediaSource+Private.h
|
| index 757c1746ef76e2667aed38e19d0420e38571803c..55d268a495fe82823bcf35a4c2f397d3d1c9d1fa 100644
|
| --- a/webrtc/sdk/objc/Framework/Classes/RTCVideoSource+Private.h
|
| +++ b/webrtc/sdk/objc/Framework/Classes/RTCMediaSource+Private.h
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
| + * Copyright 2016 The WebRTC project authors. All Rights Reserved.
|
| *
|
| * Use of this source code is governed by a BSD-style license
|
| * that can be found in the LICENSE file in the root of the source
|
| @@ -8,25 +8,25 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#import "WebRTC/RTCVideoSource.h"
|
| +#import "WebRTC/RTCMediaSource.h"
|
|
|
| #include "webrtc/api/mediastreaminterface.h"
|
|
|
| NS_ASSUME_NONNULL_BEGIN
|
|
|
| -@interface RTCVideoSource ()
|
| +typedef NS_ENUM(NSInteger, RTCMediaSourceType) {
|
| + RTCMediaSourceTypeAudio,
|
| + RTCMediaSourceTypeVideo,
|
| +};
|
| +
|
| +@interface RTCMediaSource ()
|
|
|
| -/**
|
| - * The VideoTrackSourceInterface object passed to this RTCVideoSource during
|
| - * construction.
|
| - */
|
| @property(nonatomic, readonly)
|
| - rtc::scoped_refptr<webrtc::VideoTrackSourceInterface>
|
| - nativeVideoSource;
|
| + rtc::scoped_refptr<webrtc::MediaSourceInterface> nativeMediaSource;
|
|
|
| -/** Initialize an RTCVideoSource from a native VideoTrackSourceInterface. */
|
| -- (instancetype)initWithNativeVideoSource:
|
| - (rtc::scoped_refptr<webrtc::VideoTrackSourceInterface>)nativeVideoSource
|
| +- (instancetype)initWithNativeMediaSource:
|
| + (rtc::scoped_refptr<webrtc::MediaSourceInterface>)nativeMediaSource
|
| + type:(RTCMediaSourceType)type
|
| NS_DESIGNATED_INITIALIZER;
|
|
|
| + (webrtc::MediaSourceInterface::SourceState)nativeSourceStateForState:
|
|
|