summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@qt.io>2016-04-19 09:52:20 +0200
committerMaurice Kalinowski <maurice.kalinowski@qt.io>2016-09-19 09:05:29 +0000
commit0f47f44d2fc7b3fac7fdd8ee6eeafd767c43ec2e (patch)
treefa94d84f4e8ad3f4f887d834752f4b0bf807d89e /src/plugins
parent3c893cc4ef799f987638e56ef43f1ac5cbe0c249 (diff)
winrt: Add QCameraFlashControl
This is without video modes so far, simply because video itself is not supported yet. Also included a cleanup for string conversions. Task-number: QTBUG-48541 Change-Id: Ib090f61861596e095d597cf7e5e74f7040fbc58f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/winrt/qwinrtcameracontrol.cpp11
-rw-r--r--src/plugins/winrt/qwinrtcameracontrol.h2
-rw-r--r--src/plugins/winrt/qwinrtcameraflashcontrol.cpp191
-rw-r--r--src/plugins/winrt/qwinrtcameraflashcontrol.h76
-rw-r--r--src/plugins/winrt/qwinrtcameraservice.cpp4
-rw-r--r--src/plugins/winrt/winrt.pro2
6 files changed, 286 insertions, 0 deletions
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
index c32a5f2e2..f81a2e94d 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
@@ -42,6 +42,7 @@
#include "qwinrtvideodeviceselectorcontrol.h"
#include "qwinrtcameraimagecapturecontrol.h"
#include "qwinrtimageencodercontrol.h"
+#include "qwinrtcameraflashcontrol.h"
#include "qwinrtcamerafocuscontrol.h"
#include "qwinrtcameralockscontrol.h"
@@ -554,6 +555,7 @@ public:
QPointer<QWinRTVideoDeviceSelectorControl> videoDeviceSelector;
QPointer<QWinRTCameraImageCaptureControl> imageCaptureControl;
QPointer<QWinRTImageEncoderControl> imageEncoderControl;
+ QPointer<QWinRTCameraFlashControl> cameraFlashControl;
QPointer<QWinRTCameraFocusControl> cameraFocusControl;
QPointer<QWinRTCameraLocksControl> cameraLocksControl;
QAtomicInt framesMapped;
@@ -578,6 +580,7 @@ QWinRTCameraControl::QWinRTCameraControl(QObject *parent)
d->videoDeviceSelector = new QWinRTVideoDeviceSelectorControl(this);
d->imageCaptureControl = new QWinRTCameraImageCaptureControl(this);
d->imageEncoderControl = new QWinRTImageEncoderControl(this);
+ d->cameraFlashControl = new QWinRTCameraFlashControl(this);
d->cameraFocusControl = new QWinRTCameraFocusControl(this);
d->cameraLocksControl = new QWinRTCameraLocksControl(this);
@@ -815,6 +818,12 @@ QImageEncoderControl *QWinRTCameraControl::imageEncoderControl() const
return d->imageEncoderControl;
}
+QCameraFlashControl *QWinRTCameraControl::cameraFlashControl() const
+{
+ Q_D(const QWinRTCameraControl);
+ return d->cameraFlashControl;
+}
+
QCameraFocusControl *QWinRTCameraControl::cameraFocusControl() const
{
Q_D(const QWinRTCameraControl);
@@ -940,6 +949,8 @@ HRESULT QWinRTCameraControl::initialize()
hr = advancedVideoDeviceController->get_FocusControl(&d->focusControl);
Q_ASSERT_SUCCEEDED(hr);
+ d->cameraFlashControl->initialize(advancedVideoDeviceController);
+
boolean isFocusSupported;
hr = d->focusControl->get_Supported(&isFocusSupported);
Q_ASSERT_SUCCEEDED(hr);
diff --git a/src/plugins/winrt/qwinrtcameracontrol.h b/src/plugins/winrt/qwinrtcameracontrol.h
index 85dd4d44b..f978a8b2c 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.h
+++ b/src/plugins/winrt/qwinrtcameracontrol.h
@@ -69,6 +69,7 @@ class QVideoRendererControl;
class QVideoDeviceSelectorControl;
class QCameraImageCaptureControl;
class QImageEncoderControl;
+class QCameraFlashControl;
class QCameraFocusControl;
class QCameraLocksControl;
@@ -95,6 +96,7 @@ public:
QVideoDeviceSelectorControl *videoDeviceSelector() const;
QCameraImageCaptureControl *imageCaptureControl() const;
QImageEncoderControl *imageEncoderControl() const;
+ QCameraFlashControl *cameraFlashControl() const;
QCameraFocusControl *cameraFocusControl() const;
QCameraLocksControl *cameraLocksControl() const;
diff --git a/src/plugins/winrt/qwinrtcameraflashcontrol.cpp b/src/plugins/winrt/qwinrtcameraflashcontrol.cpp
new file mode 100644
index 000000000..1ea877672
--- /dev/null
+++ b/src/plugins/winrt/qwinrtcameraflashcontrol.cpp
@@ -0,0 +1,191 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies).
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwinrtcameraflashcontrol.h"
+#include "qwinrtcameracontrol.h"
+#include <QtCore/QTimer>
+#include <QtCore/qfunctions_winrt.h>
+#include <QtCore/private/qeventdispatcher_winrt_p.h>
+
+#include <windows.media.devices.h>
+#include <wrl.h>
+#include <functional>
+
+using namespace Microsoft::WRL;
+using namespace ABI::Windows::Media::Devices;
+
+QT_BEGIN_NAMESPACE
+
+class QWinRTCameraFlashControlPrivate
+{
+public:
+ ComPtr<IFlashControl> flashControl;
+
+ QList<QCameraExposure::FlashModes> supportedModes;
+ QCameraExposure::FlashModes currentModes;
+ bool initialized;
+};
+
+QWinRTCameraFlashControl::QWinRTCameraFlashControl(QWinRTCameraControl *parent)
+ : QCameraFlashControl(parent), d_ptr(new QWinRTCameraFlashControlPrivate)
+{
+ qCDebug(lcMMCamera) << __FUNCTION__ << parent;
+ Q_D(QWinRTCameraFlashControl);
+
+ d->initialized = false;
+ d->currentModes = QCameraExposure::FlashOff;
+}
+
+void QWinRTCameraFlashControl::initialize(Microsoft::WRL::ComPtr<IAdvancedVideoCaptureDeviceController2> &controller)
+{
+ qCDebug(lcMMCamera) << __FUNCTION__;
+ Q_D(QWinRTCameraFlashControl);
+
+ d->initialized = false;
+
+ d->supportedModes.clear();
+ HRESULT hr;
+ hr = QEventDispatcherWinRT::runOnXamlThread([d, controller]() {
+ HRESULT hr;
+ hr = controller->get_FlashControl(&d->flashControl);
+ RETURN_HR_IF_FAILED("Could not access flash control.");
+
+ boolean oldAuto;
+ boolean oldEnabled;
+ // IFlashControl::get_Supported() is only valid for additional
+ // controls (RedEye, etc.) so we have to manually try to set
+ // and reset flash
+ if (SUCCEEDED(d->flashControl->get_Auto(&oldAuto))) {
+ hr = d->flashControl->put_Auto(!oldAuto);
+ if (SUCCEEDED(hr)) {
+ d->flashControl->put_Auto(oldAuto);
+ d->supportedModes.append(QCameraExposure::FlashAuto);
+ }
+ }
+
+ if (SUCCEEDED(d->flashControl->get_Enabled(&oldEnabled))) {
+ hr = d->flashControl->put_Enabled(!oldEnabled);
+ if (SUCCEEDED(hr)) {
+ d->flashControl->put_Enabled(oldEnabled);
+ d->supportedModes.append(QCameraExposure::FlashOff);
+ d->supportedModes.append(QCameraExposure::FlashOn);
+ }
+ }
+
+ boolean val;
+ hr = d->flashControl->get_Supported(&val);
+ if (SUCCEEDED(hr) && val) {
+ hr = d->flashControl->get_RedEyeReductionSupported(&val);
+ if (SUCCEEDED(hr) && val)
+ d->supportedModes.append(QCameraExposure::FlashRedEyeReduction);
+
+ // ### There is no Qt API to actually set the power values.
+ // However query if the camera could theoretically do it
+ hr = d->flashControl->get_PowerSupported(&val);
+ if (SUCCEEDED(hr) && val)
+ d->supportedModes.append(QCameraExposure::FlashManual);
+ }
+
+ return S_OK;
+ });
+ Q_ASSERT_SUCCEEDED(hr);
+ d->initialized = true;
+ setFlashMode(d->currentModes);
+}
+
+QCameraExposure::FlashModes QWinRTCameraFlashControl::flashMode() const
+{
+ Q_D(const QWinRTCameraFlashControl);
+ return d->currentModes;
+}
+
+void QWinRTCameraFlashControl::setFlashMode(QCameraExposure::FlashModes mode)
+{
+ qCDebug(lcMMCamera) << __FUNCTION__ << mode;
+ Q_D(QWinRTCameraFlashControl);
+
+ if (!d->initialized) {
+ d->currentModes = mode;
+ return;
+ }
+
+ if (!isFlashModeSupported(mode))
+ return;
+
+ QEventDispatcherWinRT::runOnXamlThread([d, mode]() {
+ HRESULT hr;
+ if (mode.testFlag(QCameraExposure::FlashAuto)) {
+ hr = d->flashControl->put_Enabled(true);
+ RETURN_OK_IF_FAILED("Could not set flash mode on.");
+ hr = d->flashControl->put_Auto(true);
+ RETURN_OK_IF_FAILED("Could not set flash mode auto.");
+ d->currentModes = QCameraExposure::FlashAuto;
+ } else if (mode.testFlag(QCameraExposure::FlashOn)) {
+ hr = d->flashControl->put_Enabled(true);
+ RETURN_OK_IF_FAILED("Could not set flash mode on.");
+ hr = d->flashControl->put_Auto(false);
+ RETURN_OK_IF_FAILED("Could not disable flash auto mode.");
+ d->currentModes = QCameraExposure::FlashOn;
+ } else if (mode.testFlag(QCameraExposure::FlashRedEyeReduction)) {
+ hr = d->flashControl->put_Enabled(true);
+ RETURN_OK_IF_FAILED("Could not set flash mode on.");
+ hr = d->flashControl->put_RedEyeReduction(true);
+ RETURN_OK_IF_FAILED("Could not set flash mode red eye reduction.");
+ d->currentModes = QCameraExposure::FlashRedEyeReduction;
+ } else {
+ hr = d->flashControl->put_Enabled(false);
+ RETURN_OK_IF_FAILED("Could not set flash mode off.");
+ d->currentModes = QCameraExposure::FlashOff;
+ }
+ return S_OK;
+ });
+}
+
+bool QWinRTCameraFlashControl::isFlashModeSupported(QCameraExposure::FlashModes mode) const
+{
+ Q_D(const QWinRTCameraFlashControl);
+ qCDebug(lcMMCamera) << __FUNCTION__ << mode;
+ return d->initialized ? d->supportedModes.contains(mode) : false;
+}
+
+bool QWinRTCameraFlashControl::isFlashReady() const
+{
+ qCDebug(lcMMCamera) << __FUNCTION__;
+ // No native API to query state
+ return true;
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/winrt/qwinrtcameraflashcontrol.h b/src/plugins/winrt/qwinrtcameraflashcontrol.h
new file mode 100644
index 000000000..335329037
--- /dev/null
+++ b/src/plugins/winrt/qwinrtcameraflashcontrol.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies).
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWINRTCAMERAFLASHCONTROL_H
+#define QWINRTCAMERAFLASHCONTROL_H
+#include <qcameraflashcontrol.h>
+
+#include <wrl.h>
+
+namespace ABI {
+ namespace Windows {
+ namespace Media {
+ namespace Devices {
+ struct IAdvancedVideoCaptureDeviceController2;
+ }
+ }
+ }
+}
+
+QT_BEGIN_NAMESPACE
+
+class QWinRTCameraControl;
+class QWinRTCameraFlashControlPrivate;
+class QWinRTCameraFlashControl : public QCameraFlashControl
+{
+ Q_OBJECT
+public:
+ explicit QWinRTCameraFlashControl(QWinRTCameraControl *parent);
+
+ void initialize(Microsoft::WRL::ComPtr<ABI::Windows::Media::Devices::IAdvancedVideoCaptureDeviceController2> &controller);
+
+ QCameraExposure::FlashModes flashMode() const Q_DECL_OVERRIDE;
+ void setFlashMode(QCameraExposure::FlashModes mode) Q_DECL_OVERRIDE;
+ bool isFlashModeSupported(QCameraExposure::FlashModes mode) const Q_DECL_OVERRIDE;
+
+ bool isFlashReady() const Q_DECL_OVERRIDE;
+
+private:
+ QScopedPointer<QWinRTCameraFlashControlPrivate> d_ptr;
+ Q_DECLARE_PRIVATE(QWinRTCameraFlashControl)
+};
+
+#endif // QWINRTCAMERAFLASHCONTROL_H
diff --git a/src/plugins/winrt/qwinrtcameraservice.cpp b/src/plugins/winrt/qwinrtcameraservice.cpp
index f76edae51..d0327a708 100644
--- a/src/plugins/winrt/qwinrtcameraservice.cpp
+++ b/src/plugins/winrt/qwinrtcameraservice.cpp
@@ -50,6 +50,7 @@
#include <QtMultimedia/QVideoRendererControl>
#include <QtMultimedia/QVideoDeviceSelectorControl>
#include <QtMultimedia/QImageEncoderControl>
+#include <QtMultimedia/QCameraFlashControl>
#include <QtMultimedia/QCameraFocusControl>
#include <QtMultimedia/QCameraLocksControl>
#include <QtMultimedia/QMediaVideoProbeControl>
@@ -98,6 +99,9 @@ QMediaControl *QWinRTCameraService::requestControl(const char *name)
if (qstrcmp(name, QImageEncoderControl_iid) == 0)
return d->cameraControl->imageEncoderControl();
+ if (qstrcmp(name, QCameraFlashControl_iid) == 0)
+ return d->cameraControl->cameraFlashControl();
+
if (qstrcmp(name, QCameraFocusControl_iid) == 0)
return d->cameraControl->cameraFocusControl();
diff --git a/src/plugins/winrt/winrt.pro b/src/plugins/winrt/winrt.pro
index 87e44cce2..940064f46 100644
--- a/src/plugins/winrt/winrt.pro
+++ b/src/plugins/winrt/winrt.pro
@@ -6,6 +6,7 @@ LIBS += -lmfplat -lmfuuid -loleaut32 -ld3d11 -lruntimeobject
HEADERS += \
qwinrtabstractvideorenderercontrol.h \
qwinrtcameracontrol.h \
+ qwinrtcameraflashcontrol.h \
qwinrtcamerafocuscontrol.h \
qwinrtcameraimagecapturecontrol.h \
qwinrtcamerainfocontrol.h \
@@ -23,6 +24,7 @@ HEADERS += \
SOURCES += \
qwinrtabstractvideorenderercontrol.cpp \
qwinrtcameracontrol.cpp \
+ qwinrtcameraflashcontrol.cpp \
qwinrtcamerafocuscontrol.cpp \
qwinrtcameraimagecapturecontrol.cpp \
qwinrtcamerainfocontrol.cpp \