From d6e52bea2da1d31bce91d1a175f9b9e84b8e37f5 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 23 Mar 2021 13:31:22 +0100
Subject: 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>
---
 src/qtmultimediaquicktools/qsgvideonode_texture.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/qtmultimediaquicktools/qsgvideonode_texture.cpp')

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;
     }
 };
 
-- 
cgit v1.2.3