diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2022-02-09 10:28:07 +0100 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2022-03-03 08:43:35 +0100 |
commit | 99af62e4c3752aa0ab31c1e2a288caca5a12e1a9 (patch) | |
tree | 1a92c7b88bac689bbc01109b6c033c03899bb291 | |
parent | 5244909f912da4b9e1cfe7df76cd7f889e1f3d2e (diff) | |
download | qtmultimedia-99af62e4c3752aa0ab31c1e2a288caca5a12e1a9.tar.gz |
AVFoundation plugin (iOS) fix minor build problems
Delete unused functions, move the unused (on iOS) declaration into
the corresponding macOS-specific part of code.
Minor: update some copyright headers (dates).
Change-Id: Ie46452b705db6d7a5918273849b4cffc752a9660
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
(cherry picked from commit 476137ff3307c8d868c9aff71d2bd9fd404113cb)
-rw-r--r-- | src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm | 5 | ||||
-rw-r--r-- | src/multimedia/platform/darwin/camera/avfcamera.mm | 27 |
2 files changed, 4 insertions, 28 deletions
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm index 17754518b..60b3ee77f 100644 --- a/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm +++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). +** Copyright (C) 2022 The Qt Company Ltd and/or its subsidiary(-ies). ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. @@ -487,8 +487,6 @@ bool QDarwinAudioSource::open() if (m_isOpen) return true; - UInt32 size = 0; - AudioComponentDescription componentDescription; componentDescription.componentType = kAudioUnitType_Output; #if defined(Q_OS_OSX) @@ -567,6 +565,7 @@ bool QDarwinAudioSource::open() m_streamFormat = CoreAudioUtils::toAudioStreamBasicDescription(m_audioFormat); #if defined(Q_OS_OSX) + UInt32 size = 0; if (m_audioFormat == m_audioDeviceInfo.preferredFormat()) { #endif diff --git a/src/multimedia/platform/darwin/camera/avfcamera.mm b/src/multimedia/platform/darwin/camera/avfcamera.mm index ede3c49eb..a0f890a39 100644 --- a/src/multimedia/platform/darwin/camera/avfcamera.mm +++ b/src/multimedia/platform/darwin/camera/avfcamera.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). +** Copyright (C) 2022 The Qt Company Ltd and/or its subsidiary(-ies). ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. @@ -56,29 +56,6 @@ namespace { // Misc. helpers to check values/ranges: -bool qt_check_ISO_conversion(float isoValue) -{ - if (isoValue >= std::numeric_limits<int>::max()) - return false; - if (isoValue <= std::numeric_limits<int>::min()) - return false; - return true; -} - -bool qt_check_ISO_range(AVCaptureDeviceFormat *format) -{ - // Qt is using int for ISO, AVFoundation - float. It looks like the ISO range - // at the moment can be represented by int (it's max - min > 100, etc.). - Q_ASSERT(format); - if (format.maxISO - format.minISO < 1.) { - // ISO is in some strange units? - return false; - } - - return qt_check_ISO_conversion(format.minISO) - && qt_check_ISO_conversion(format.maxISO); -} - bool qt_check_exposure_duration(AVCaptureDevice *captureDevice, CMTime duration) { Q_ASSERT(captureDevice); @@ -565,7 +542,7 @@ void AVFCamera::zoomTo(float factor, float rate) if (rate < 0) captureDevice.videoZoomFactor = factor; else - [AVCaptureDevice rampToVideoZoomFactor:factor withRate:rate]; + [captureDevice rampToVideoZoomFactor:factor withRate:rate]; #endif } |