Add target conditionals for Mac Catalyst

pull/17304/head
Chris Ballinger 5 years ago committed by Chris Ballinger
parent de720ac34a
commit 220df8252d
  1. 2
      modules/videoio/src/cap_avfoundation.mm
  2. 2
      modules/videoio/src/cap_ios_abstract_camera.mm

@ -383,7 +383,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
[mCaptureDecompressedVideoOutput setVideoSettings:pixelBufferOptions];
mCaptureDecompressedVideoOutput.alwaysDiscardsLateVideoFrames = YES;
#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
#if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_MACCATALYST
mCaptureDecompressedVideoOutput.minFrameDuration = CMTimeMake(1, 30);
#endif

@ -299,11 +299,13 @@
}
else
{
#if !TARGET_OS_MACCATALYST
// Deprecated in 6.0; here for backward compatibility
if ([self.captureVideoPreviewLayer isOrientationSupported])
{
[self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation];
}
#endif
}
if (parentView != nil) {

Loading…
Cancel
Save