diff options
Diffstat (limited to 'src/multimedia/video/qvideoframe.h')
-rw-r--r-- | src/multimedia/video/qvideoframe.h | 71 |
1 files changed, 24 insertions, 47 deletions
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index f1e329c38..5a2cf177d 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/video/qvideoframe.h @@ -1,46 +1,11 @@ -/**************************************************************************** -** -** 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 QVIDEOFRAME_H #define QVIDEOFRAME_H #include <QtMultimedia/qtmultimediaglobal.h> +#include <QtMultimedia/qtvideo.h> #include <QtMultimedia/qvideoframeformat.h> #include <QtCore/qmetatype.h> @@ -76,16 +41,19 @@ public: ReadWrite = ReadOnly | WriteOnly }; +#if QT_DEPRECATED_SINCE(6, 7) enum RotationAngle { - Rotation0 = 0, - Rotation90 = 90, - Rotation180 = 180, - Rotation270 = 270 + Rotation0 Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::Rotation::None instead") = 0, + Rotation90 Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::Rotation::Clockwise90 instead") = 90, + Rotation180 Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::Rotation::Clockwise180 instead") = 180, + Rotation270 Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtVideo::Rotation::Clockwise270 instead") = 270 }; +#endif QVideoFrame(); QVideoFrame(const QVideoFrameFormat &format); + explicit QVideoFrame(const QImage &image); QVideoFrame(const QVideoFrame &other); ~QVideoFrame(); @@ -126,21 +94,29 @@ public: int mappedBytes(int plane) const; int planeCount() const; - quint64 textureHandle(int plane) const; - std::unique_ptr<QRhiTexture> rhiTexture(int plane) const; - qint64 startTime() const; void setStartTime(qint64 time); qint64 endTime() const; void setEndTime(qint64 time); - void setRotationAngle(RotationAngle); - RotationAngle rotationAngle() const; +#if QT_DEPRECATED_SINCE(6, 7) + QT_DEPRECATED_VERSION_X_6_7("Use QVideoFrame::setRotation(QtVideo::Rotation) instead") + void setRotationAngle(RotationAngle angle) { setRotation(QtVideo::Rotation(angle)); } + + QT_DEPRECATED_VERSION_X_6_7("Use QVideoFrame::rotation() instead") + RotationAngle rotationAngle() const { return RotationAngle(rotation()); } +#endif + + void setRotation(QtVideo::Rotation angle); + QtVideo::Rotation rotation() const; void setMirrored(bool); bool mirrored() const; + void setStreamFrameRate(qreal rate); + qreal streamFrameRate() const; + QImage toImage() const; struct PaintOptions { @@ -162,6 +138,7 @@ public: QAbstractVideoBuffer *videoBuffer() const; private: + friend class QVideoFramePrivate; QExplicitlySharedDataPointer<QVideoFramePrivate> d; }; |