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

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/RTCMediaStream.mm

Issue 1903663002: Build dynamic iOS SDK. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix test gyp Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #import "RTCMediaStream.h" 11 #import "RTCMediaStream+Private.h"
12 12
13 #include <vector> 13 #include <vector>
14 14
15 #import "webrtc/api/objc/RTCAudioTrack+Private.h" 15 #import "NSString+StdString.h"
16 #import "webrtc/api/objc/RTCMediaStream+Private.h" 16 #import "RTCAudioTrack+Private.h"
17 #import "webrtc/api/objc/RTCMediaStreamTrack+Private.h" 17 #import "RTCMediaStreamTrack+Private.h"
18 #import "webrtc/api/objc/RTCPeerConnectionFactory+Private.h" 18 #import "RTCPeerConnectionFactory+Private.h"
19 #import "webrtc/api/objc/RTCVideoTrack+Private.h" 19 #import "RTCVideoTrack+Private.h"
20 #import "webrtc/base/objc/NSString+StdString.h"
21 20
22 @implementation RTCMediaStream { 21 @implementation RTCMediaStream {
23 NSMutableArray *_audioTracks; 22 NSMutableArray *_audioTracks;
24 NSMutableArray *_videoTracks; 23 NSMutableArray *_videoTracks;
25 rtc::scoped_refptr<webrtc::MediaStreamInterface> _nativeMediaStream; 24 rtc::scoped_refptr<webrtc::MediaStreamInterface> _nativeMediaStream;
26 } 25 }
27 26
28 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory 27 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
29 streamId:(NSString *)streamId { 28 streamId:(NSString *)streamId {
30 NSParameterAssert(factory); 29 NSParameterAssert(factory);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 RTCMediaStreamTrackType type = RTCMediaStreamTrackTypeVideo; 113 RTCMediaStreamTrackType type = RTCMediaStreamTrackTypeVideo;
115 RTCVideoTrack *videoTrack = 114 RTCVideoTrack *videoTrack =
116 [[RTCVideoTrack alloc] initWithNativeTrack:track type:type]; 115 [[RTCVideoTrack alloc] initWithNativeTrack:track type:type];
117 [_videoTracks addObject:videoTrack]; 116 [_videoTracks addObject:videoTrack];
118 } 117 }
119 } 118 }
120 return self; 119 return self;
121 } 120 }
122 121
123 @end 122 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698