diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:02:53 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:02:53 +0100 |
| commit | 81e0861c60899c14395903b053b1045210740a43 (patch) | |
| tree | 72a47d355ae556d20338dadb978bceb8972a434f /src/plugins/avfoundation | |
| parent | 836bde2ba1a3fc5bdce51aad839e07fb7584af35 (diff) | |
| parent | 265bfb22e7f0f5333e584f6dd91926b8516e394e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ic6618a0d2e40f7008d766d861f4d2cb0190a94dd
Diffstat (limited to 'src/plugins/avfoundation')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerasession.mm | 3 | ||||
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm index a3263badc..3c5f8f09a 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 91f3cb7dc..a77d7de03 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) |