diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-03-23 13:31:22 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-04-06 08:11:45 +0000 |
commit | d6e52bea2da1d31bce91d1a175f9b9e84b8e37f5 (patch) | |
tree | 90e41da7f8a6abdd069da5e7fcd410d8accb8843 /src/qtmultimediaquicktools/qsgvideonode_texture.cpp | |
parent | 9aaec39aef634a9f2d972f35484a566bdd01ecd6 (diff) |
Move the PixelFormat enum from QVideoFrame to QVideoSurfaceFormat
Change-Id: Ifa888c74c397c640b19387a9ce624dfcf8269c2c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/qtmultimediaquicktools/qsgvideonode_texture.cpp')
-rw-r--r-- | src/qtmultimediaquicktools/qsgvideonode_texture.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp index 0a52f06c4..cc345d61a 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp @@ -45,18 +45,18 @@ QT_BEGIN_NAMESPACE -QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_Texture::supportedPixelFormats( +QList<QVideoSurfaceFormat::PixelFormat> QSGVideoNodeFactory_Texture::supportedPixelFormats( QVideoFrame::HandleType) const { - QList<QVideoFrame::PixelFormat> pixelFormats; + QList<QVideoSurfaceFormat::PixelFormat> pixelFormats; - pixelFormats.append(QVideoFrame::Format_RGB565); - pixelFormats.append(QVideoFrame::Format_RGB32); - pixelFormats.append(QVideoFrame::Format_ARGB32); - pixelFormats.append(QVideoFrame::Format_BGR32); - pixelFormats.append(QVideoFrame::Format_BGRA32); + pixelFormats.append(QVideoSurfaceFormat::Format_RGB565); + pixelFormats.append(QVideoSurfaceFormat::Format_RGB32); + pixelFormats.append(QVideoSurfaceFormat::Format_ARGB32); + pixelFormats.append(QVideoSurfaceFormat::Format_BGR32); + pixelFormats.append(QVideoSurfaceFormat::Format_BGRA32); #if !QT_CONFIG(gpu_vivante) - pixelFormats.append(QVideoFrame::Format_ABGR32); + pixelFormats.append(QVideoSurfaceFormat::Format_ABGR32); #endif return pixelFormats; @@ -143,8 +143,8 @@ public: private: [[nodiscard]] bool needsSwizzling() const { - return m_format.pixelFormat() == QVideoFrame::Format_RGB32 - || m_format.pixelFormat() == QVideoFrame::Format_ARGB32; + return m_format.pixelFormat() == QVideoSurfaceFormat::Format_RGB32 + || m_format.pixelFormat() == QVideoSurfaceFormat::Format_ARGB32; } }; |