From d0f4c2185b47e12df35e24c971ef12862bf9f8af Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Tue, 20 Aug 2013 22:16:55 +0000 Subject: [PATCH] iOS: unbreak the build following r4546 BUG=2255 R=niklas.enbom@webrtc.org, sjlee@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2078004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4577 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/examples/ios/AppRTCDemo/APPRTCAppClient.m | 7 +------ webrtc/build/common.gypi | 1 + .../modules/video_capture/ios/video_capture_ios_objc.mm | 2 +- webrtc/modules/video_capture/video_capture.gypi | 9 +++++++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m b/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m index 93f0d36a31..93f693f455 100644 --- a/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m +++ b/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m @@ -34,7 +34,7 @@ @interface APPRTCAppClient () -@property(nonatomic, assign) dispatch_queue_t backgroundQueue; +@property(nonatomic, strong) dispatch_queue_t backgroundQueue; @property(nonatomic, copy) NSString *baseURL; @property(nonatomic, strong) GAEChannelClient *gaeChannel; @property(nonatomic, copy) NSString *postMessageUrl; @@ -52,7 +52,6 @@ - (id)init { if (self = [super init]) { _backgroundQueue = dispatch_queue_create("RTCBackgroundQueue", NULL); - dispatch_retain(_backgroundQueue); _sendQueue = [NSMutableArray array]; // Uncomment to see Request/Response logging. // _verboseLogging = YES; @@ -60,10 +59,6 @@ return self; } -- (void)dealloc { - dispatch_release(_backgroundQueue); -} - #pragma mark - Public methods - (void)connectToRoom:(NSURL *)url { diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 17516f49d5..e8ba842278 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -133,6 +133,7 @@ 'enable_android_opensl%': 0, }], ['OS=="ios"', { + 'build_libjpeg%': 0, 'enable_protobuf%': 0, 'include_tests%': 0, }], diff --git a/webrtc/modules/video_capture/ios/video_capture_ios_objc.mm b/webrtc/modules/video_capture/ios/video_capture_ios_objc.mm index 67cc5d1df7..5b8d69786e 100644 --- a/webrtc/modules/video_capture/ios/video_capture_ios_objc.mm +++ b/webrtc/modules/video_capture/ios/video_capture_ios_objc.mm @@ -39,7 +39,7 @@ using namespace webrtc::videocapturemodule; AVCaptureVideoDataOutput* captureOutput = [[AVCaptureVideoDataOutput alloc] init]; [captureOutput setSampleBufferDelegate:self - queue:dispatch_get_current_queue()]; + queue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)]; NSString* key = (NSString*)kCVPixelBufferPixelFormatTypeKey; NSNumber* val = [NSNumber diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index 6086fb942b..cf58295b2c 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -126,6 +126,15 @@ 'ios/video_capture_ios_objc.h', 'ios/video_capture_ios_objc.mm', ], + 'all_dependent_settings': { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ + '-framework AVFoundation', + '-framework CoreMedia', + '-framework CoreVideo', + ], + }, + }, }], # ios ], # conditions }], # include_internal_video_capture