summaryrefslogtreecommitdiffstats
path: root/src/multimedia/video/qimagevideobuffer_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/video/qimagevideobuffer_p.h')
-rw-r--r--src/multimedia/video/qimagevideobuffer_p.h66
1 files changed, 14 insertions, 52 deletions
diff --git a/src/multimedia/video/qimagevideobuffer_p.h b/src/multimedia/video/qimagevideobuffer_p.h
index f2b88dd9b..94841f87a 100644
--- a/src/multimedia/video/qimagevideobuffer_p.h
+++ b/src/multimedia/video/qimagevideobuffer_p.h
@@ -1,45 +1,12 @@
-/****************************************************************************
-**
-** 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) 2023 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 QIMAGEVIDEOBUFFER_P_H
#define QIMAGEVIDEOBUFFER_P_H
+#include <private/qabstractvideobuffer_p.h>
+#include <qimage.h>
+
//
// W A R N I N G
// -------------
@@ -51,29 +18,24 @@
// We mean it.
//
-#include <qabstractvideobuffer.h>
-
QT_BEGIN_NAMESPACE
-
-class QImage;
-
-class QImageVideoBufferPrivate;
-
class Q_MULTIMEDIA_EXPORT QImageVideoBuffer : public QAbstractVideoBuffer
{
- Q_DECLARE_PRIVATE(QImageVideoBuffer)
public:
- QImageVideoBuffer(const QImage &image);
- ~QImageVideoBuffer();
+ QImageVideoBuffer(QImage image);
- MapMode mapMode() const override;
+ MapData map(QVideoFrame::MapMode mode) override;
- uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override;
void unmap() override;
+
+ QImage underlyingImage() const;
+
+private:
+ QVideoFrame::MapMode m_mapMode = QVideoFrame::NotMapped;
+ QImage m_image;
};
QT_END_NAMESPACE
-
-#endif
+#endif // QIMAGEVIDEOBUFFER_P_H