Merge "Merge remote-tracking branch 'origin/5.15' into dev"

1 files changed, 33 insertions, 0 deletions

diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index 3c5f8f09a..6ee9c2636 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -48,6 +48,7 @@
 #include "avfcameraviewfindersettingscontrol.h"
 #include "avfimageencodercontrol.h"
 #include "avfcamerautility.h"
+#include "avfcamerawindowcontrol.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
@@ -146,6 +147,7 @@ QList<AVFCameraInfo> AVFCameraSession::m_cameraDevices;
 AVFCameraSession::AVFCameraSession(AVFCameraService *service, QObject *parent)
    : QObject(parent)
    , m_service(service)
+   , m_capturePreviewWindowOutput(nullptr)
    , m_state(QCamera::UnloadedState)
    , m_active(false)
    , m_videoInput(nil)
@@ -160,6 +162,10 @@ AVFCameraSession::AVFCameraSession(AVFCameraService *service, QObject *parent)
 
 AVFCameraSession::~AVFCameraSession()
 {
+    if (m_capturePreviewWindowOutput) {
+        m_capturePreviewWindowOutput->setLayer(nil);
+    }
+
     if (m_videoInput) {
         [m_captureSession removeInput:m_videoInput];
         [m_videoInput release];
@@ -257,6 +263,29 @@ void AVFCameraSession::setVideoOutput(AVFCameraRendererControl *output)
         output->configureAVCaptureSession(this);
 }
 
+void AVFCameraSession::setCapturePreviewOutput(AVFCameraWindowControl *output)
+{
+#ifdef QT_DEBUG_AVF
+    qDebug() << Q_FUNC_INFO << output;
+#endif
+
+    if (m_capturePreviewWindowOutput == output)
+        return;
+
+    if (m_capturePreviewWindowOutput)
+        m_capturePreviewWindowOutput->setLayer(nil);
+
+    m_capturePreviewWindowOutput = output;
+
+    if (m_capturePreviewWindowOutput) {
+        AVCaptureVideoPreviewLayer *previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:m_captureSession];
+        m_capturePreviewWindowOutput->setLayer(previewLayer);
+        if (AVFCameraViewfinderSettingsControl2 *vfControl = m_service->viewfinderSettingsControl2()) {
+            m_capturePreviewWindowOutput->setNativeSize(vfControl->viewfinderSettings().resolution());
+        }
+    }
+}
+
 AVCaptureDevice *AVFCameraSession::videoCaptureDevice() const
 {
     if (m_videoInput)
@@ -409,6 +438,10 @@ bool AVFCameraSession::applyViewfinderSettings()
         }
 
         vfControl->applySettings(vfSettings);
+
+        if (m_capturePreviewWindowOutput)
+            m_capturePreviewWindowOutput->setNativeSize(vfControl->viewfinderSettings().resolution());
+
         return !vfSettings.isNull();
     }