Remove the handle type from QVideoSurfaceFormat

This is a property of the individual QVideoFrame, and doesn't
belong here.

Change-Id: I85f180ff46023f6a48ef856a356d9c45c3f6be1b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

1 files changed, 5 insertions, 11 deletions

diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
index 51b02f43b..729aa33ad 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
@@ -44,26 +44,20 @@
 QT_BEGIN_NAMESPACE
 
 QList<QVideoFrame::PixelFormat> QSGVideoNodeFactory_YUV::supportedPixelFormats(
-                                        QVideoFrame::HandleType handleType) const
+                                        QVideoFrame::HandleType) const
 {
     QList<QVideoFrame::PixelFormat> formats;
 
-    if (handleType == QVideoFrame::NoHandle) {
-        formats << QVideoFrame::Format_YUV420P << QVideoFrame::Format_YV12 << QVideoFrame::Format_YUV422P
-                << QVideoFrame::Format_NV12 << QVideoFrame::Format_NV21
-                << QVideoFrame::Format_UYVY << QVideoFrame::Format_YUYV;
-    } else if (handleType == QVideoFrame::GLTextureHandle) {
-        formats << QVideoFrame::Format_NV12 << QVideoFrame::Format_NV21;
-    } else if (handleType == QVideoFrame::MTLTextureHandle) {
-        formats << QVideoFrame::Format_NV12 << QVideoFrame::Format_NV21;
-    }
+    formats << QVideoFrame::Format_YUV420P << QVideoFrame::Format_YV12 << QVideoFrame::Format_YUV422P
+            << QVideoFrame::Format_NV12 << QVideoFrame::Format_NV21
+            << QVideoFrame::Format_UYVY << QVideoFrame::Format_YUYV;
 
     return formats;
 }
 
 QSGVideoNode *QSGVideoNodeFactory_YUV::createNode(const QVideoSurfaceFormat &format)
 {
-    if (supportedPixelFormats(format.handleType()).contains(format.pixelFormat()))
+    if (supportedPixelFormats(QVideoFrame::NoHandle).contains(format.pixelFormat()))
         return new QSGVideoNode_YUV(format);
 
     return nullptr;