diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerasession.mm | 3 | ||||
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 8f1500ee3..04f5843a4 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.7 +MODULE_VERSION = 5.12.8 diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm index 8e3436d39..148c4a6e0 100644 --- a/src/plugins/avfoundation/camera/avfcamerasession.mm +++ b/src/plugins/avfoundation/camera/avfcamerasession.mm @@ -408,7 +408,8 @@ bool AVFCameraSession::applyViewfinderSettings() vfSettings.setResolution(imageResolution); } - return vfControl->applySettings(vfSettings); + vfControl->applySettings(vfSettings); + return !vfSettings.isNull(); } return false; diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm index 26112f559..0054a8d01 100644 --- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm +++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm @@ -185,6 +185,7 @@ void AVFCameraViewfinderSettingsControl2::setViewfinderSettings(const QCameraVie return; m_settings = settings; + applySettings(m_settings); } QVideoFrame::PixelFormat AVFCameraViewfinderSettingsControl2::QtPixelFormatFromCVFormat(unsigned avPixelFormat) |