diff options
Diffstat (limited to 'src/multimedia/camera/qcamera.h')
| -rw-r--r-- | src/multimedia/camera/qcamera.h | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 9c6fc8f8a..a50c38496 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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 @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -47,6 +47,7 @@ #include <QtMultimedia/qcameraexposure.h> #include <QtMultimedia/qcamerafocus.h> #include <QtMultimedia/qcameraimageprocessing.h> +#include <QtMultimedia/qcameraviewfindersettings.h> #include <QtMultimedia/qmediaenumdebug.h> @@ -76,6 +77,8 @@ class Q_MULTIMEDIA_EXPORT QCamera : public QMediaObject Q_ENUMS(LockType) Q_ENUMS(Position) public: + typedef QPair<qreal, qreal> FrameRateRange; + enum Status { UnavailableStatus, UnloadedStatus, @@ -169,6 +172,21 @@ public: void setViewfinder(QGraphicsVideoItem *viewfinder); void setViewfinder(QAbstractVideoSurface *surface); + QCameraViewfinderSettings viewfinderSettings() const; + void setViewfinderSettings(const QCameraViewfinderSettings &settings); + + QList<QCameraViewfinderSettings> supportedViewfinderSettings( + const QCameraViewfinderSettings &settings = QCameraViewfinderSettings()) const; + + QList<QSize> supportedViewfinderResolutions( + const QCameraViewfinderSettings &settings = QCameraViewfinderSettings()) const; + + QList<FrameRateRange> supportedViewfinderFrameRateRanges( + const QCameraViewfinderSettings &settings = QCameraViewfinderSettings()) const; + + QList<QVideoFrame::PixelFormat> supportedViewfinderPixelFormats( + const QCameraViewfinderSettings &settings = QCameraViewfinderSettings()) const; + Error error() const; QString errorString() const; |