mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
63ee39d0be
This reverts commit 181ea6e414.
Reason for revert: Breaks downstream project. Kári will help to land it next week.
Original change's description:
> Add a prefix for objc category.
>
> According to the Google Objective-C style [1], category names should
> start with an appropriate prefix. WebRTC has some category definitions
> for system interfaces, but it doesn't use prefixes.
>
> $ otool -ov WebRTC.framework/WebRTC | grep -E "^[0-9a-z]{16} 0x[0-9a-z]+ __OBJC_._CATEGORY" | grep -v "_RTC"
> 0000000002160840 0x217c3c0 __OBJC_$_CATEGORY_UIDevice_$_H264Profile
> 0000000002160850 0x21808b8 __OBJC_$_CATEGORY_AVCaptureSession_$_DevicePosition
> 0000000002160858 0x2180968 __OBJC_$_CATEGORY_NSString_$_StdString
> 0000000002160860 0x21809c8 __OBJC_$_CATEGORY_NSString_$_AbslStringView
>
> To avoid conflicts, prefix the names and methods of those categories.
> Also remove sdk/objc/Framework/Classes/Common/NSString+StdString.h as
> it is not used by any other files.
>
> [1] https://google.github.io/styleguide/objcguide.html#category-naming
>
> Bug: webrtc:13884
> Change-Id: I2cf2742af198ab4e0bfb15c0476d72971e50ceee
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262341
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36880}
Bug: webrtc:13884
Change-Id: I85257088e4a3a62e01ff925ab5e77af83b078ef3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262420
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36885}
113 lines
4 KiB
Text
113 lines
4 KiB
Text
/*
|
|
* 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 "RTCMediaStreamTrack+Private.h"
|
|
#import "RTCPeerConnectionFactory+Private.h"
|
|
#import "RTCVideoSource+Private.h"
|
|
#import "api/RTCVideoRendererAdapter+Private.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCVideoTrack) {
|
|
NSMutableArray *_adapters;
|
|
}
|
|
|
|
@synthesize source = _source;
|
|
|
|
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
|
|
source:(RTC_OBJC_TYPE(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.get());
|
|
if (self = [self initWithFactory:factory nativeTrack:track type:RTCMediaStreamTrackTypeVideo]) {
|
|
_source = source;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory) *)factory
|
|
nativeTrack:
|
|
(rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)nativeMediaTrack
|
|
type:(RTCMediaStreamTrackType)type {
|
|
NSParameterAssert(factory);
|
|
NSParameterAssert(nativeMediaTrack);
|
|
NSParameterAssert(type == RTCMediaStreamTrackTypeVideo);
|
|
if (self = [super initWithFactory:factory nativeTrack:nativeMediaTrack type:type]) {
|
|
_adapters = [NSMutableArray array];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc {
|
|
for (RTCVideoRendererAdapter *adapter in _adapters) {
|
|
self.nativeVideoTrack->RemoveSink(adapter.nativeVideoRenderer);
|
|
}
|
|
}
|
|
|
|
- (RTC_OBJC_TYPE(RTCVideoSource) *)source {
|
|
if (!_source) {
|
|
rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> source(
|
|
self.nativeVideoTrack->GetSource());
|
|
if (source) {
|
|
_source = [[RTC_OBJC_TYPE(RTCVideoSource) alloc] initWithFactory:self.factory
|
|
nativeVideoSource:source];
|
|
}
|
|
}
|
|
return _source;
|
|
}
|
|
|
|
- (void)addRenderer:(id<RTC_OBJC_TYPE(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<RTC_OBJC_TYPE(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 rtc::scoped_refptr<webrtc::VideoTrackInterface>(
|
|
static_cast<webrtc::VideoTrackInterface *>(self.nativeTrack.get()));
|
|
}
|
|
|
|
@end
|