Reason for revert: Take three of relanding this after all internal issues have been resolved. Original issue's description: > Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ ) > > Reason for revert: > Breaks downstream project. > > Original issue's description: > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ ) > > > > Reason for revert: > > Take two of fixing downstream issues? > > > > Original issue's description: > > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ ) > > > > > > Reason for revert: > > > Still problems with downstream projects > > > > > > Original issue's description: > > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ ) > > > > > > > > Reason for revert: > > > > Fixing downstream breakages > > > > > > > > Original issue's description: > > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ ) > > > > > > > > > > Reason for revert: > > > > > Breaking downstream projects. > > > > > > > > > > Original issue's description: > > > > > > Split iOS sdk in to separate targets > > > > > > > > > > > > This CL splits the iOS sdk into separate static libraries for video, > > > > > > audio, ui, common, and peerconnection-related code. This will in the > > > > > > future make it easier to compile WebRTC without unneeded components. > > > > > > > > > > > > BUG=webrtc:4867 > > > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2862543002 > > > > > > Cr-Commit-Position: refs/heads/master@{#18166} > > > > > > Committed:52c83fe710> > > > > > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org > > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > > NOPRESUBMIT=true > > > > > NOTREECHECKS=true > > > > > NOTRY=true > > > > > BUG=webrtc:4867 > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2890513002 > > > > > Cr-Commit-Position: refs/heads/master@{#18170} > > > > > Committed:9756238084> > > > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > NOPRESUBMIT=true > > > > NOTREECHECKS=true > > > > NOTRY=true > > > > BUG=webrtc:4867 > > > > > > > > Review-Url: https://codereview.webrtc.org/2890733003 > > > > Cr-Commit-Position: refs/heads/master@{#18174} > > > > Committed:d51e042492> > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:4867 > > > > > > Review-Url: https://codereview.webrtc.org/2893593002 > > > Cr-Commit-Position: refs/heads/master@{#18182} > > > Committed:37144b214e> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:4867 > > > > Review-Url: https://codereview.webrtc.org/2893843003 > > Cr-Commit-Position: refs/heads/master@{#18303} > > Committed:580c3522d2> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:4867 > > Review-Url: https://codereview.webrtc.org/2911053002 > Cr-Commit-Position: refs/heads/master@{#18309} > Committed:af5c05540cTBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4867 Review-Url: https://codereview.webrtc.org/2913753003 Cr-Commit-Position: refs/heads/master@{#18319}
123 lines
4.0 KiB
Plaintext
123 lines
4.0 KiB
Plaintext
/*
|
|
* Copyright 2015 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
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import "RTCMediaStream+Private.h"
|
|
|
|
#include <vector>
|
|
|
|
#import "NSString+StdString.h"
|
|
#import "RTCAudioTrack+Private.h"
|
|
#import "RTCMediaStreamTrack+Private.h"
|
|
#import "RTCPeerConnectionFactory+Private.h"
|
|
#import "RTCVideoTrack+Private.h"
|
|
|
|
@implementation RTCMediaStream {
|
|
NSMutableArray *_audioTracks;
|
|
NSMutableArray *_videoTracks;
|
|
rtc::scoped_refptr<webrtc::MediaStreamInterface> _nativeMediaStream;
|
|
}
|
|
|
|
- (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
|
|
streamId:(NSString *)streamId {
|
|
NSParameterAssert(factory);
|
|
NSParameterAssert(streamId.length);
|
|
std::string nativeId = [NSString stdStringForString:streamId];
|
|
rtc::scoped_refptr<webrtc::MediaStreamInterface> stream =
|
|
factory.nativeFactory->CreateLocalMediaStream(nativeId);
|
|
return [self initWithNativeMediaStream:stream];
|
|
}
|
|
|
|
- (NSArray<RTCAudioTrack *> *)audioTracks {
|
|
return [_audioTracks copy];
|
|
}
|
|
|
|
- (NSArray<RTCVideoTrack *> *)videoTracks {
|
|
return [_videoTracks copy];
|
|
}
|
|
|
|
- (NSString *)streamId {
|
|
return [NSString stringForStdString:_nativeMediaStream->label()];
|
|
}
|
|
|
|
- (void)addAudioTrack:(RTCAudioTrack *)audioTrack {
|
|
if (_nativeMediaStream->AddTrack(audioTrack.nativeAudioTrack)) {
|
|
[_audioTracks addObject:audioTrack];
|
|
}
|
|
}
|
|
|
|
- (void)addVideoTrack:(RTCVideoTrack *)videoTrack {
|
|
if (_nativeMediaStream->AddTrack(videoTrack.nativeVideoTrack)) {
|
|
[_videoTracks addObject:videoTrack];
|
|
}
|
|
}
|
|
|
|
- (void)removeAudioTrack:(RTCAudioTrack *)audioTrack {
|
|
NSUInteger index = [_audioTracks indexOfObjectIdenticalTo:audioTrack];
|
|
NSAssert(index != NSNotFound,
|
|
@"|removeAudioTrack| called on unexpected RTCAudioTrack");
|
|
if (index != NSNotFound &&
|
|
_nativeMediaStream->RemoveTrack(audioTrack.nativeAudioTrack)) {
|
|
[_audioTracks removeObjectAtIndex:index];
|
|
}
|
|
}
|
|
|
|
- (void)removeVideoTrack:(RTCVideoTrack *)videoTrack {
|
|
NSUInteger index = [_videoTracks indexOfObjectIdenticalTo:videoTrack];
|
|
NSAssert(index != NSNotFound,
|
|
@"|removeVideoTrack| called on unexpected RTCVideoTrack");
|
|
if (index != NSNotFound &&
|
|
_nativeMediaStream->RemoveTrack(videoTrack.nativeVideoTrack)) {
|
|
[_videoTracks removeObjectAtIndex:index];
|
|
}
|
|
}
|
|
|
|
- (NSString *)description {
|
|
return [NSString stringWithFormat:@"RTCMediaStream:\n%@\nA=%lu\nV=%lu",
|
|
self.streamId,
|
|
(unsigned long)self.audioTracks.count,
|
|
(unsigned long)self.videoTracks.count];
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (rtc::scoped_refptr<webrtc::MediaStreamInterface>)nativeMediaStream {
|
|
return _nativeMediaStream;
|
|
}
|
|
|
|
- (instancetype)initWithNativeMediaStream:
|
|
(rtc::scoped_refptr<webrtc::MediaStreamInterface>)nativeMediaStream {
|
|
NSParameterAssert(nativeMediaStream);
|
|
if (self = [super init]) {
|
|
webrtc::AudioTrackVector audioTracks = nativeMediaStream->GetAudioTracks();
|
|
webrtc::VideoTrackVector videoTracks = nativeMediaStream->GetVideoTracks();
|
|
|
|
_audioTracks = [NSMutableArray arrayWithCapacity:audioTracks.size()];
|
|
_videoTracks = [NSMutableArray arrayWithCapacity:videoTracks.size()];
|
|
_nativeMediaStream = nativeMediaStream;
|
|
|
|
for (auto &track : audioTracks) {
|
|
RTCMediaStreamTrackType type = RTCMediaStreamTrackTypeAudio;
|
|
RTCAudioTrack *audioTrack =
|
|
[[RTCAudioTrack alloc] initWithNativeTrack:track type:type];
|
|
[_audioTracks addObject:audioTrack];
|
|
}
|
|
|
|
for (auto &track : videoTracks) {
|
|
RTCMediaStreamTrackType type = RTCMediaStreamTrackTypeVideo;
|
|
RTCVideoTrack *videoTrack =
|
|
[[RTCVideoTrack alloc] initWithNativeTrack:track type:type];
|
|
[_videoTracks addObject:videoTrack];
|
|
}
|
|
}
|
|
return self;
|
|
}
|
|
|
|
@end
|