diff options
Diffstat (limited to 'src/multimedia/video/qmemoryvideobuffer_p.h')
| -rw-r--r-- | src/multimedia/video/qmemoryvideobuffer_p.h | 49 |
1 files changed, 7 insertions, 42 deletions
diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/video/qmemoryvideobuffer_p.h index 078b1af26..ec97abd4f 100644 --- a/src/multimedia/video/qmemoryvideobuffer_p.h +++ b/src/multimedia/video/qmemoryvideobuffer_p.h @@ -1,47 +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 QMEMORYVIDEOBUFFER_P_H #define QMEMORYVIDEOBUFFER_P_H #include <private/qabstractvideobuffer_p.h> -#include <qvideoframe.h> // // W A R N I N G @@ -59,7 +22,7 @@ QT_BEGIN_NAMESPACE class Q_MULTIMEDIA_EXPORT QMemoryVideoBuffer : public QAbstractVideoBuffer { public: - QMemoryVideoBuffer(const QByteArray &data, int bytesPerLine); + QMemoryVideoBuffer(QByteArray data, int bytesPerLine); ~QMemoryVideoBuffer(); QVideoFrame::MapMode mapMode() const override; @@ -67,9 +30,11 @@ public: MapData map(QVideoFrame::MapMode mode) override; void unmap() override; - int bytesPerLine = 0; + QByteArray underlyingByteArray(int plane) const override; +private: + int m_bytesPerLine = 0; QVideoFrame::MapMode m_mapMode = QVideoFrame::NotMapped; - QByteArray data; + QByteArray m_data; }; QT_END_NAMESPACE |