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}
111 lines
3.6 KiB
Plaintext
111 lines
3.6 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 "RTCVideoTrack+Private.h"
|
|
|
|
#import "NSString+StdString.h"
|
|
#import "RTCMediaStreamTrack+Private.h"
|
|
#import "RTCPeerConnectionFactory+Private.h"
|
|
#import "RTCVideoRendererAdapter+Private.h"
|
|
#import "RTCVideoSource+Private.h"
|
|
|
|
@implementation RTCVideoTrack {
|
|
NSMutableArray *_adapters;
|
|
}
|
|
|
|
@synthesize source = _source;
|
|
|
|
- (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
|
|
source:(RTCVideoSource *)source
|
|
trackId:(NSString *)trackId {
|
|
NSParameterAssert(factory);
|
|
NSParameterAssert(source);
|
|
NSParameterAssert(trackId.length);
|
|
std::string nativeId = [NSString stdStringForString:trackId];
|
|
rtc::scoped_refptr<webrtc::VideoTrackInterface> track =
|
|
factory.nativeFactory->CreateVideoTrack(nativeId,
|
|
source.nativeVideoSource);
|
|
if ([self initWithNativeTrack:track type:RTCMediaStreamTrackTypeVideo]) {
|
|
_source = source;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithNativeTrack:
|
|
(rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeMediaTrack
|
|
type:(RTCMediaStreamTrackType)type {
|
|
NSParameterAssert(nativeMediaTrack);
|
|
NSParameterAssert(type == RTCMediaStreamTrackTypeVideo);
|
|
if (self = [super initWithNativeTrack:nativeMediaTrack type:type]) {
|
|
_adapters = [NSMutableArray array];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc {
|
|
for (RTCVideoRendererAdapter *adapter in _adapters) {
|
|
self.nativeVideoTrack->RemoveSink(adapter.nativeVideoRenderer);
|
|
}
|
|
}
|
|
|
|
- (RTCVideoSource *)source {
|
|
if (!_source) {
|
|
rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> source =
|
|
self.nativeVideoTrack->GetSource();
|
|
if (source) {
|
|
_source = [[RTCVideoSource alloc] initWithNativeVideoSource:source.get()];
|
|
}
|
|
}
|
|
return _source;
|
|
}
|
|
|
|
- (void)addRenderer:(id<RTCVideoRenderer>)renderer {
|
|
// Make sure we don't have this renderer yet.
|
|
for (RTCVideoRendererAdapter *adapter in _adapters) {
|
|
if (adapter.videoRenderer == renderer) {
|
|
NSAssert(NO, @"|renderer| is already attached to this track");
|
|
return;
|
|
}
|
|
}
|
|
// Create a wrapper that provides a native pointer for us.
|
|
RTCVideoRendererAdapter* adapter =
|
|
[[RTCVideoRendererAdapter alloc] initWithNativeRenderer:renderer];
|
|
[_adapters addObject:adapter];
|
|
self.nativeVideoTrack->AddOrUpdateSink(adapter.nativeVideoRenderer,
|
|
rtc::VideoSinkWants());
|
|
}
|
|
|
|
- (void)removeRenderer:(id<RTCVideoRenderer>)renderer {
|
|
__block NSUInteger indexToRemove = NSNotFound;
|
|
[_adapters enumerateObjectsUsingBlock:^(RTCVideoRendererAdapter *adapter,
|
|
NSUInteger idx,
|
|
BOOL *stop) {
|
|
if (adapter.videoRenderer == renderer) {
|
|
indexToRemove = idx;
|
|
*stop = YES;
|
|
}
|
|
}];
|
|
if (indexToRemove == NSNotFound) {
|
|
return;
|
|
}
|
|
RTCVideoRendererAdapter *adapterToRemove =
|
|
[_adapters objectAtIndex:indexToRemove];
|
|
self.nativeVideoTrack->RemoveSink(adapterToRemove.nativeVideoRenderer);
|
|
[_adapters removeObjectAtIndex:indexToRemove];
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (rtc::scoped_refptr<webrtc::VideoTrackInterface>)nativeVideoTrack {
|
|
return static_cast<webrtc::VideoTrackInterface *>(self.nativeTrack.get());
|
|
}
|
|
|
|
@end
|