diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
| commit | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (patch) | |
| tree | 406ffa7e3ae0a346a14175ccccb8ac7e596d8f8f /src/plugins/avfoundation/camera/avfimagecapturecontrol.mm | |
| parent | fa9fe9ff8c3aba25fbae4f8f32588dd6477d6df8 (diff) | |
| parent | f0e0d5d901d4e28fff9f29caf86ada84906b3db4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/winrt/qwinrtcameracontrol.cpp
Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
Diffstat (limited to 'src/plugins/avfoundation/camera/avfimagecapturecontrol.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfimagecapturecontrol.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm index dea407e3b..6465e69e3 100644 --- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm +++ b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm @@ -40,6 +40,7 @@ #include "avfcameradebug.h" #include "avfimagecapturecontrol.h" #include "avfcameraservice.h" +#include "avfcamerautility.h" #include "avfcameracontrol.h" #include <QtCore/qurl.h> @@ -214,6 +215,8 @@ void AVFImageCaptureControl::updateCaptureConnection() if (![captureSession.outputs containsObject:m_stillImageOutput]) { if ([captureSession canAddOutput:m_stillImageOutput]) { + // Lock the video capture device to make sure the active format is not reset + const AVFConfigurationLock lock(m_session->videoCaptureDevice()); [captureSession addOutput:m_stillImageOutput]; m_videoConnection = [m_stillImageOutput connectionWithMediaType:AVMediaTypeVideo]; updateReadyStatus(); |