summaryrefslogtreecommitdiff
path: root/src/plugins/avfoundation/camera/avfcamerasession.mm
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-09-21 10:27:33 -0700
committerJake Petroules <jake.petroules@qt.io>2016-09-23 04:05:48 +0000
commit4d3dae3fa63d64cc97226969c4bf7d6d91b63b57 (patch)
tree84b405be3c1a6520c34fddfda0b3c97a311f4460 /src/plugins/avfoundation/camera/avfcamerasession.mm
parente1ae1235f259393e72e4a2e0d77278e9054405fb (diff)
downloadqtmultimedia-4d3dae3fa63d64cc97226969c4bf7d6d91b63b57.tar.gz
Remove deprecated QSysInfo APIs and dead code from macOS/iOS backend
Deployment targets are currently macOS 10.9 and iOS 7.0. Change-Id: I500a95c00eb3be6e693e38f0f2205941f7bc9601 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.mm')
-rw-r--r--src/plugins/avfoundation/camera/avfcamerasession.mm16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index c32b072ef..0b7c0e9d8 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -432,18 +432,12 @@ void AVFCameraSession::removeProbe(AVFMediaVideoProbeControl *probe)
FourCharCode AVFCameraSession::defaultCodec()
{
if (!m_defaultCodec) {
-#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_7, __IPHONE_7_0)
- if (QSysInfo::MacintoshVersion >= qt_OS_limit(QSysInfo::MV_10_7, QSysInfo::MV_IOS_7_0)) {
- if (AVCaptureDevice *device = videoCaptureDevice()) {
- AVCaptureDeviceFormat *format = device.activeFormat;
- if (!format || !format.formatDescription)
- return m_defaultCodec;
- m_defaultCodec = CMVideoFormatDescriptionGetCodecType(format.formatDescription);
- }
+ if (AVCaptureDevice *device = videoCaptureDevice()) {
+ AVCaptureDeviceFormat *format = device.activeFormat;
+ if (!format || !format.formatDescription)
+ return m_defaultCodec;
+ m_defaultCodec = CMVideoFormatDescriptionGetCodecType(format.formatDescription);
}
-#else
- // TODO: extract media subtype.
-#endif
}
return m_defaultCodec;
}