generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iOS: unbreak the build following r4546

Browse Source 
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
This commit is contained in:
fischman@webrtc.org 2013-08-20 22:16:55 +00:00
parent ebe68aad44
commit d0f4c2185b
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
talk/examples/ios/AppRTCDemo/APPRTCAppClient.m
View File

@ -34,7 +34,7 @@
@interface APPRTCAppClient () @interface APPRTCAppClient ()
@property(nonatomic, assign) dispatch_queue_t backgroundQueue; @property(nonatomic, strong) dispatch_queue_t backgroundQueue;
@property(nonatomic, copy) NSString *baseURL; @property(nonatomic, copy) NSString *baseURL;
@property(nonatomic, strong) GAEChannelClient *gaeChannel; @property(nonatomic, strong) GAEChannelClient *gaeChannel;
@property(nonatomic, copy) NSString *postMessageUrl; @property(nonatomic, copy) NSString *postMessageUrl;
@ -52,7 +52,6 @@
- (id)init { - (id)init {
if (self = [super init]) { if (self = [super init]) {
_backgroundQueue = dispatch_queue_create("RTCBackgroundQueue", NULL); _backgroundQueue = dispatch_queue_create("RTCBackgroundQueue", NULL);
dispatch_retain(_backgroundQueue);
_sendQueue = [NSMutableArray array]; _sendQueue = [NSMutableArray array];
// Uncomment to see Request/Response logging. // Uncomment to see Request/Response logging.
// _verboseLogging = YES; // _verboseLogging = YES;
@ -60,10 +59,6 @@
return self; return self;
} }
- (void)dealloc {
dispatch_release(_backgroundQueue);
}
#pragma mark - Public methods #pragma mark - Public methods
- (void)connectToRoom:(NSURL *)url { - (void)connectToRoom:(NSURL *)url {

1
webrtc/build/common.gypi
View File

@ -133,6 +133,7 @@
'enable_android_opensl%': 0, 'enable_android_opensl%': 0,
}], }],
['OS=="ios"', { ['OS=="ios"', {
'build_libjpeg%': 0,
'enable_protobuf%': 0, 'enable_protobuf%': 0,
'include_tests%': 0, 'include_tests%': 0,
}], }],

2
webrtc/modules/video_capture/ios/video_capture_ios_objc.mm
View File

@ -39,7 +39,7 @@ using namespace webrtc::videocapturemodule;
AVCaptureVideoDataOutput* captureOutput = AVCaptureVideoDataOutput* captureOutput =
[[AVCaptureVideoDataOutput alloc] init]; [[AVCaptureVideoDataOutput alloc] init];
[captureOutput setSampleBufferDelegate:self [captureOutput setSampleBufferDelegate:self
queue:dispatch_get_current_queue()]; queue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)];
NSString* key = (NSString*)kCVPixelBufferPixelFormatTypeKey; NSString* key = (NSString*)kCVPixelBufferPixelFormatTypeKey;
NSNumber* val = [NSNumber NSNumber* val = [NSNumber

9
webrtc/modules/video_capture/video_capture.gypi
View File

@ -126,6 +126,15 @@
'ios/video_capture_ios_objc.h', 'ios/video_capture_ios_objc.h',
'ios/video_capture_ios_objc.mm', 'ios/video_capture_ios_objc.mm',
], ],
'all_dependent_settings': {
'xcode_settings': {
'OTHER_LDFLAGS': [
'-framework AVFoundation',
'-framework CoreMedia',
'-framework CoreVideo',
],
},
},
}], # ios }], # ios
], # conditions ], # conditions
}], # include_internal_video_capture }], # include_internal_video_capture