Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(340)

Unified Diff: webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm

Issue 2890513002: Revert of Split iOS sdk in to separate targets (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm
deleted file mode 100644
index 0737dee8a93d1aca452acf31037a54a1385292d1..0000000000000000000000000000000000000000
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaStream.mm
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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

Powered by Google App Engine
This is Rietveld 408576698