| Index: webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
|
| diff --git a/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm b/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
|
| index 5708346ae2bccdee06da02c5eea8d2a13d37d453..115f7f847a5b291fddd3a61b582bb1222789c6b8 100644
|
| --- a/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
|
| +++ b/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
|
| @@ -304,7 +304,8 @@ static NSString *GetSessionPresetForVideoFormat(
|
|
|
| - (void)handleCaptureSessionInterruption:(NSNotification *)notification {
|
| NSString *reasonString = nil;
|
| -#if defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0
|
| +#if defined(__IPHONE_9_0) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \
|
| + && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0
|
| NSNumber *reason =
|
| notification.userInfo[AVCaptureSessionInterruptionReasonKey];
|
| if (reason) {
|
| @@ -411,7 +412,8 @@ static NSString *GetSessionPresetForVideoFormat(
|
|
|
| - (BOOL)setupCaptureSession {
|
| AVCaptureSession *captureSession = [[AVCaptureSession alloc] init];
|
| -#if defined(__IPHONE_7_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0
|
| +#if defined(__IPHONE_7_0) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \
|
| + && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0
|
| NSString *version = [[UIDevice currentDevice] systemVersion];
|
| if ([version integerValue] >= 7) {
|
| captureSession.usesApplicationAudioSession = NO;
|
|
|