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

Unified Diff: webrtc/examples/objc/AppRTCDemo/ARDAppClient.m

Issue 2283743003: Add local capturer on mac (Closed)
Patch Set: rebase to master Created 4 years, 4 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
« no previous file with comments | « no previous file | webrtc/examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/examples/objc/AppRTCDemo/ARDAppClient.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m b/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m
index 9f6195167084ccd265778472cb5369b4bc315d57..1020621cc1bd2b91340963ac20609688aaacd8f6 100644
--- a/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m
+++ b/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m
@@ -10,9 +10,7 @@
#import "ARDAppClient+Internal.h"
-#if defined(WEBRTC_IOS)
#import "WebRTC/RTCAVFoundationVideoSource.h"
-#endif
#import "WebRTC/RTCAudioTrack.h"
#import "WebRTC/RTCConfiguration.h"
#import "WebRTC/RTCFileLogger.h"
@@ -53,14 +51,11 @@ static NSString * const kARDMediaStreamId = @"ARDAMS";
static NSString * const kARDAudioTrackId = @"ARDAMSa0";
static NSString * const kARDVideoTrackId = @"ARDAMSv0";
-// TODO(tkchin): Remove guard once rtc_sdk_common_objc compiles on Mac.
-#if defined(WEBRTC_IOS)
// TODO(tkchin): Add these as UI options.
static BOOL const kARDAppClientEnableTracing = NO;
static BOOL const kARDAppClientEnableRtcEventLog = YES;
static int64_t const kARDAppClientAecDumpMaxSizeInBytes = 5e6; // 5 MB.
static int64_t const kARDAppClientRtcEventLogMaxSizeInBytes = 5e6; // 5 MB.
-#endif
// We need a proxy to NSTimer because it causes a strong retain cycle. When
// using the proxy, |invalidate| must be called before it properly deallocs.
@@ -698,9 +693,7 @@ static int64_t const kARDAppClientRtcEventLogMaxSizeInBytes = 5e6; // 5 MB.
// The iOS simulator doesn't provide any sort of camera capture
// support or emulation (http://goo.gl/rHAnC1) so don't bother
// trying to open a local stream.
- // TODO(tkchin): local video capture for OSX. See
- // https://code.google.com/p/webrtc/issues/detail?id=3417.
-#if !TARGET_IPHONE_SIMULATOR && TARGET_OS_IPHONE
+#if !TARGET_IPHONE_SIMULATOR
if (!_isAudioOnly) {
RTCMediaConstraints *mediaConstraints =
[self defaultMediaStreamConstraints];
« no previous file with comments | « no previous file | webrtc/examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698