1 files changed, 2 insertions, 52 deletions

diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h
index bd69095da..028286426 100644
--- a/src/multimedia/video/qvideoframe.h
+++ b/src/multimedia/video/qvideoframe.h
@@ -41,6 +41,7 @@
 #define QVIDEOFRAME_H
 
 #include <QtMultimedia/qtmultimediaglobal.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
 
 #include <QtCore/qmetatype.h>
 #include <QtCore/qshareddata.h>
@@ -52,57 +53,10 @@ QT_BEGIN_NAMESPACE
 class QSize;
 class QVideoFramePrivate;
 class QAbstractVideoBuffer;
-class QVideoSurfaceFormat;
 
 class Q_MULTIMEDIA_EXPORT QVideoFrame
 {
 public:
-    enum PixelFormat
-    {
-        Format_Invalid,
-        Format_ARGB32,
-        Format_ARGB32_Premultiplied,
-        Format_RGB32,
-        Format_RGB24,
-        Format_RGB565,
-        Format_RGB555,
-        Format_ARGB8565_Premultiplied,
-        Format_BGRA32,
-        Format_BGRA32_Premultiplied,
-        Format_ABGR32,
-        Format_BGR32,
-        Format_BGR24,
-        Format_BGR565,
-        Format_BGR555,
-        Format_BGRA5658_Premultiplied,
-
-        Format_AYUV444,
-        Format_AYUV444_Premultiplied,
-        Format_YUV444,
-        Format_YUV420P,
-        Format_YUV422P,
-        Format_YV12,
-        Format_UYVY,
-        Format_YUYV,
-        Format_NV12,
-        Format_NV21,
-        Format_IMC1,
-        Format_IMC2,
-        Format_IMC3,
-        Format_IMC4,
-        Format_Y8,
-        Format_Y16,
-
-        Format_P010LE,
-        Format_P010BE,
-        Format_P016LE,
-        Format_P016BE,
-
-        Format_Jpeg,
-    };
-#ifndef Q_QDOC
-    static constexpr int NPixelFormats = Format_Jpeg + 1;
-#endif
 
     enum HandleType
     {
@@ -133,7 +87,7 @@ public:
     QAbstractVideoBuffer *buffer() const;
     bool isValid() const;
 
-    PixelFormat pixelFormat() const;
+    QVideoSurfaceFormat::PixelFormat pixelFormat() const;
 
     QVideoSurfaceFormat surfaceFormat() const;
     QVideoFrame::HandleType handleType() const;
@@ -171,9 +125,6 @@ public:
 
     QImage image() const;
 
-    static PixelFormat pixelFormatFromImageFormat(QImage::Format format);
-    static QImage::Format imageFormatFromPixelFormat(PixelFormat format);
-
 private:
     QExplicitlySharedDataPointer<QVideoFramePrivate> d;
 };
@@ -183,7 +134,6 @@ Q_DECLARE_METATYPE(QVideoFrame);
 #ifndef QT_NO_DEBUG_STREAM
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QVideoFrame&);
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, QVideoFrame::HandleType);
-Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, QVideoFrame::PixelFormat);
 #endif
 
 QT_END_NAMESPACE