Rename QVideoSurfaceFormat to QVideoFrameFormat

The class is used exclusively together with video frames to
describe their format, so the name should reflect that.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h
index d2c371c3f..2d5e2d57e 100644
--- a/src/multimedia/video/qvideoframe.h
+++ b/src/multimedia/video/qvideoframe.h
@@ -41,7 +41,7 @@
 #define QVIDEOFRAME_H
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qvideosurfaceformat.h>
+#include <QtMultimedia/qvideoframeformat.h>
 
 #include <QtCore/qmetatype.h>
 #include <QtCore/qshareddata.h>
@@ -76,8 +76,8 @@ public:
     };
 
     QVideoFrame();
-    QVideoFrame(QAbstractVideoBuffer *buffer, const QVideoSurfaceFormat &format);
-    QVideoFrame(int bytes, int bytesPerLine, const QVideoSurfaceFormat &format);
+    QVideoFrame(QAbstractVideoBuffer *buffer, const QVideoFrameFormat &format);
+    QVideoFrame(int bytes, int bytesPerLine, const QVideoFrameFormat &format);
     QVideoFrame(const QImage &image);
     QVideoFrame(const QVideoFrame &other);
     ~QVideoFrame();
@@ -88,9 +88,9 @@ public:
 
     bool isValid() const;
 
-    QVideoSurfaceFormat::PixelFormat pixelFormat() const;
+    QVideoFrameFormat::PixelFormat pixelFormat() const;
 
-    QVideoSurfaceFormat surfaceFormat() const;
+    QVideoFrameFormat surfaceFormat() const;
     QVideoFrame::HandleType handleType() const;
 
     QSize size() const;