diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2023-12-28 16:02:47 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-06 11:43:02 +0000 |
| commit | f61c751d4ed3a041fe4e43b1958d0402009abd78 (patch) | |
| tree | 807c7922ccb1df38059f6a809695f08b151168c9 /src | |
| parent | bf6549f1521fc182ff8a2e3871fceb99d4c58fd8 (diff) | |
Prettify QMemoryVideoBuffer
Minor cleanup in QMemoryVideoBuffer.
Pick-to: 6.6 6.5
Change-Id: I52a63519bc226bd70322c8e0b2071962bd5e023b
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 4c37eb3e481eb8cc70ced61e8d1497317183aab0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/video/qmemoryvideobuffer.cpp | 16 | ||||
| -rw-r--r-- | src/multimedia/video/qmemoryvideobuffer_p.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/video/qmemoryvideobuffer.cpp index 870ac8979..f868737db 100644 --- a/src/multimedia/video/qmemoryvideobuffer.cpp +++ b/src/multimedia/video/qmemoryvideobuffer.cpp @@ -17,11 +17,11 @@ QT_BEGIN_NAMESPACE /*! Constructs a video buffer with an image stride of \a bytesPerLine from a byte \a array. */ -QMemoryVideoBuffer::QMemoryVideoBuffer(const QByteArray &array, int bytesPerLine) - : QAbstractVideoBuffer(QVideoFrame::NoHandle) +QMemoryVideoBuffer::QMemoryVideoBuffer(QByteArray data, int bytesPerLine) + : QAbstractVideoBuffer(QVideoFrame::NoHandle), + m_bytesPerLine(bytesPerLine), + m_data(std::move(data)) { - data = array; - this->bytesPerLine = bytesPerLine; } /*! @@ -43,13 +43,13 @@ QVideoFrame::MapMode QMemoryVideoBuffer::mapMode() const QAbstractVideoBuffer::MapData QMemoryVideoBuffer::map(QVideoFrame::MapMode mode) { MapData mapData; - if (m_mapMode == QVideoFrame::NotMapped && data.size() && mode != QVideoFrame::NotMapped) { + if (m_mapMode == QVideoFrame::NotMapped && m_data.size() && mode != QVideoFrame::NotMapped) { m_mapMode = mode; mapData.nPlanes = 1; - mapData.bytesPerLine[0] = bytesPerLine; - mapData.data[0] = reinterpret_cast<uchar *>(data.data()); - mapData.size[0] = data.size(); + mapData.bytesPerLine[0] = m_bytesPerLine; + mapData.data[0] = reinterpret_cast<uchar *>(m_data.data()); + mapData.size[0] = m_data.size(); } return mapData; diff --git a/src/multimedia/video/qmemoryvideobuffer_p.h b/src/multimedia/video/qmemoryvideobuffer_p.h index 81cbc890d..d15e91ad9 100644 --- a/src/multimedia/video/qmemoryvideobuffer_p.h +++ b/src/multimedia/video/qmemoryvideobuffer_p.h @@ -5,7 +5,6 @@ #define QMEMORYVIDEOBUFFER_P_H #include <private/qabstractvideobuffer_p.h> -#include <qvideoframe.h> // // W A R N I N G @@ -23,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; @@ -31,9 +30,10 @@ public: MapData map(QVideoFrame::MapMode mode) override; void unmap() override; - int bytesPerLine = 0; +private: + int m_bytesPerLine = 0; QVideoFrame::MapMode m_mapMode = QVideoFrame::NotMapped; - QByteArray data; + QByteArray m_data; }; QT_END_NAMESPACE |