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

Side by Side Diff: talk/app/webrtc/objc/RTCMediaStream.mm

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds Created 4 years, 10 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 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 17 matching lines...) Expand all
28 #if !defined(__has_feature) || !__has_feature(objc_arc) 28 #if !defined(__has_feature) || !__has_feature(objc_arc)
29 #error "This file requires ARC support." 29 #error "This file requires ARC support."
30 #endif 30 #endif
31 31
32 #import "RTCMediaStream+Internal.h" 32 #import "RTCMediaStream+Internal.h"
33 33
34 #import "RTCAudioTrack+Internal.h" 34 #import "RTCAudioTrack+Internal.h"
35 #import "RTCMediaStreamTrack+Internal.h" 35 #import "RTCMediaStreamTrack+Internal.h"
36 #import "RTCVideoTrack+Internal.h" 36 #import "RTCVideoTrack+Internal.h"
37 37
38 #include "talk/app/webrtc/mediastreaminterface.h" 38 #include "webrtc/api/mediastreaminterface.h"
39 39
40 @implementation RTCMediaStream { 40 @implementation RTCMediaStream {
41 NSMutableArray* _audioTracks; 41 NSMutableArray* _audioTracks;
42 NSMutableArray* _videoTracks; 42 NSMutableArray* _videoTracks;
43 rtc::scoped_refptr<webrtc::MediaStreamInterface> _mediaStream; 43 rtc::scoped_refptr<webrtc::MediaStreamInterface> _mediaStream;
44 } 44 }
45 45
46 - (NSString*)description { 46 - (NSString*)description {
47 return [NSString stringWithFormat:@"[%@:A=%lu:V=%lu]", 47 return [NSString stringWithFormat:@"[%@:A=%lu:V=%lu]",
48 [self label], 48 [self label],
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 } 137 }
138 } 138 }
139 return self; 139 return self;
140 } 140 }
141 141
142 - (rtc::scoped_refptr<webrtc::MediaStreamInterface>)mediaStream { 142 - (rtc::scoped_refptr<webrtc::MediaStreamInterface>)mediaStream {
143 return _mediaStream; 143 return _mediaStream;
144 } 144 }
145 145
146 @end 146 @end
OLDNEW
« no previous file with comments | « talk/app/webrtc/objc/RTCMediaSource+Internal.h ('k') | talk/app/webrtc/objc/RTCMediaStream+Internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698