Add rotation property to QVideoFrameFormat

We initialize QMediaRecorder by its properties and matching
QVideoFrameFormat of the source. That's why, we need the property in
QVideoFrameFormat for proper initialization.

Note, we already have 'isMirrored' in QVideoFrameFormat,
'mirrored' in QVideoFrame, 'rotation' in QVideoFrame,
so adding rotation to QVdieoFrameFormat looks consistent.

[ChangeLog][QVideoFrameFormat] Added the property 'rotation' to QVideoFrameFormat.

Change-Id: I62abd2e8a1ade4e1e2144c2adc6bc6606828af88
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>

4 files changed, 26 insertions, 4 deletions

diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 9a4d62777..d30017dab 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -683,7 +683,7 @@ void QVideoFrame::setEndTime(qint64 time)
 void QVideoFrame::setRotation(QtVideo::Rotation angle)
 {
     if (d)
-        d->rotation = angle;
+        d->format.setRotation(angle);
 }
 
 /*!
@@ -691,7 +691,7 @@ void QVideoFrame::setRotation(QtVideo::Rotation angle)
  */
 QtVideo::Rotation QVideoFrame::rotation() const
 {
-    return QtVideo::Rotation(d ? d->rotation : QtVideo::Rotation::None);
+    return d ? d->format.rotation() : QtVideo::Rotation::None;
 }
 
 /*!
diff --git a/src/multimedia/video/qvideoframe_p.h b/src/multimedia/video/qvideoframe_p.h
index af891613d..cb8b7b747 100644
--- a/src/multimedia/video/qvideoframe_p.h
+++ b/src/multimedia/video/qvideoframe_p.h
@@ -49,7 +49,6 @@ public:
     int mappedCount = 0;
     QMutex mapMutex;
     QString subtitleText;
-    QtVideo::Rotation rotation = QtVideo::Rotation::None;
     QImage image;
     QMutex imageMutex;
 
diff --git a/src/multimedia/video/qvideoframeformat.cpp b/src/multimedia/video/qvideoframeformat.cpp
index 63388aab6..b3177234f 100644
--- a/src/multimedia/video/qvideoframeformat.cpp
+++ b/src/multimedia/video/qvideoframeformat.cpp
@@ -39,7 +39,8 @@ public:
             && viewport == other.viewport
             && frameRatesEqual(frameRate, other.frameRate)
             && colorSpace == other.colorSpace
-            && mirrored == other.mirrored)
+            && mirrored == other.mirrored
+            && rotation == other.rotation)
             return true;
 
         return false;
@@ -60,6 +61,7 @@ public:
     float frameRate = 0.0;
     float maxLuminance = -1.;
     bool mirrored = false;
+    QtVideo::Rotation rotation = QtVideo::Rotation::None;
 };
 
 QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QVideoFrameFormatPrivate);
@@ -683,6 +685,23 @@ void QVideoFrameFormat::setMirrored(bool mirrored)
 }
 
 /*!
+    Returns the rotation angle the matching video frame should be rotated clockwise before displaying.
+ */
+QtVideo::Rotation QVideoFrameFormat::rotation() const
+{
+    return d->rotation;
+}
+
+/*!
+    Sets the \a rotation angle the matching video frame should be rotated clockwise before displaying.
+ */
+void QVideoFrameFormat::setRotation(QtVideo::Rotation rotation)
+{
+    detach();
+    d->rotation = rotation;
+}
+
+/*!
     \internal
 */
 QString QVideoFrameFormat::vertexShaderFileName() const
diff --git a/src/multimedia/video/qvideoframeformat.h b/src/multimedia/video/qvideoframeformat.h
index 9d74e9695..18dc9952d 100644
--- a/src/multimedia/video/qvideoframeformat.h
+++ b/src/multimedia/video/qvideoframeformat.h
@@ -5,6 +5,7 @@
 #define QVIDEOSURFACEFORMAT_H
 
 #include <QtMultimedia/qtmultimediaglobal.h>
+#include <QtMultimedia/qtvideo.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qmetatype.h>
@@ -182,6 +183,9 @@ public:
     bool isMirrored() const;
     void setMirrored(bool mirrored);
 
+    QtVideo::Rotation rotation() const;
+    void setRotation(QtVideo::Rotation rotation);
+
     QString vertexShaderFileName() const;
     QString fragmentShaderFileName() const;
     void updateUniformData(QByteArray *dst, const QVideoFrame &frame, const QMatrix4x4 &transform, float opacity) const;