summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-03-02 13:11:36 +0100
committerLars Knoll <lars.knoll@qt.io>2021-03-16 07:41:44 +0000
commit5671ab651d9c938a0ff2df3a9c0baef9891e7e23 (patch)
tree4c5c6fde332af93b3d5f5cb4198df1ee0668434a /src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
parente7702afc9dfa6e69b1b05d68a38248ccc6b6dd87 (diff)
Move HandleType and MapMode from QAbstractVideoBuffer to QVideoFrame
QAbstractVideoBuffer is a class that is only required inside our implementation, so we can make it private. This change prepares for it. Change-Id: I4ba4542c1eab742f2fc93231e2e5063dbc5d5e94 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qtmultimediaquicktools/qsgvideonode_rgb.cpp')
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_rgb.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
index 72404c427..57101648d 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
@@ -44,11 +44,11 @@
QT_BEGIN_NAMESPACE
QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_RGB::supportedPixelFormats(
- QAbstractVideoBuffer::HandleType handleType) const
+ QVideoFrame::HandleType handleType) const
{
QList<QVideoFrame::PixelFormat> pixelFormats;
- if (handleType == QAbstractVideoBuffer::NoHandle) {
+ if (handleType == QVideoFrame::NoHandle) {
pixelFormats.append(QVideoFrame::Format_RGB32);
pixelFormats.append(QVideoFrame::Format_ARGB32);
pixelFormats.append(QVideoFrame::Format_BGR32);
@@ -174,7 +174,7 @@ void QSGVideoMaterialRhiShader_RGB::updateSampledImage(RenderState &state, int b
format = QRhiTexture::BGRA8;
}
- if (frame.isValid() && frame.map(QAbstractVideoBuffer::ReadOnly)) {
+ if (frame.isValid() && frame.map(QVideoFrame::ReadOnly)) {
m->m_texture->setData(format, frame.size(), frame.bits(), frame.bytesPerLine() * frame.height());
frame.unmap();
}