diff options
Diffstat (limited to 'src/multimedia/camera/qcameradevice.h')
| -rw-r--r-- | src/multimedia/camera/qcameradevice.h | 49 |
1 files changed, 11 insertions, 38 deletions
diff --git a/src/multimedia/camera/qcameradevice.h b/src/multimedia/camera/qcameradevice.h index d2a97d927..2a9fac659 100644 --- a/src/multimedia/camera/qcameradevice.h +++ b/src/multimedia/camera/qcameradevice.h @@ -1,45 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QCAMERAINFO_H #define QCAMERAINFO_H +#include <QtMultimedia/qtvideo.h> #include <QtMultimedia/qvideoframe.h> #include <QtCore/qsharedpointer.h> @@ -48,6 +13,11 @@ QT_BEGIN_NAMESPACE class QCameraFormatPrivate; class Q_MULTIMEDIA_EXPORT QCameraFormat { + Q_GADGET + Q_PROPERTY(QSize resolution READ resolution CONSTANT) + Q_PROPERTY(QVideoFrameFormat::PixelFormat pixelFormat READ pixelFormat CONSTANT) + Q_PROPERTY(float minFrameRate READ minFrameRate CONSTANT) + Q_PROPERTY(float maxFrameRate READ maxFrameRate CONSTANT) public: QCameraFormat() noexcept; QCameraFormat(const QCameraFormat &other) noexcept; @@ -79,6 +49,8 @@ class Q_MULTIMEDIA_EXPORT QCameraDevice Q_PROPERTY(QString description READ description CONSTANT) Q_PROPERTY(bool isDefault READ isDefault CONSTANT) Q_PROPERTY(Position position READ position CONSTANT) + Q_PROPERTY(QList<QCameraFormat> videoFormats READ videoFormats CONSTANT) + Q_PROPERTY(QtVideo::Rotation correctionAngle READ correctionAngle CONSTANT) public: QCameraDevice(); QCameraDevice(const QCameraDevice& other); @@ -112,6 +84,7 @@ public: QList<QSize> photoResolutions() const; QList<QCameraFormat> videoFormats() const; + QtVideo::Rotation correctionAngle() const; // ### Add zoom and other camera information private: |