Fix size of QVideoSink when the video is rotated

The size of QVideoSink impacts on sizeHint of QVideoWidget,
and it can be taken by users for their own size hints.

All renderers draw rotated videos like this: if the frame size is
AxB, and the rotation is 90 degrees, the rendering size becomes BxA.

Let's keep QVideoSink::videoSize consistent.

Added a function to qtmm utilities to get rotates size.

Pick-to: 6.7 6.6 6.5
Change-Id: Ia0cb6f43a598820007fac8178104631a80d96dfb
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/multimedia/platform/qplatformvideosink.cpp b/src/multimedia/platform/qplatformvideosink.cpp
index 268291da2..abf82af0f 100644
--- a/src/multimedia/platform/qplatformvideosink.cpp
+++ b/src/multimedia/platform/qplatformvideosink.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qplatformvideosink_p.h"
+#include "qmultimediautils_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -36,10 +37,14 @@ void QPlatformVideoSink::setVideoFrame(const QVideoFrame &frame)
             return;
         m_currentVideoFrame = frame;
         m_currentVideoFrame.setSubtitleText(m_subtitleText);
-        sizeChanged = m_nativeSize != frame.size();
-        m_nativeSize = frame.size();
+        const auto size = qRotatedFrameSize(frame);
+        if (size != m_nativeSize) {
+            m_nativeSize = size;
+            sizeChanged = true;
+        }
     }
 
+    // emit signals outside the mutex to avoid deadlocks on the user side
     if (sizeChanged)
         emit m_sink->videoSizeChanged();
     emit m_sink->videoFrameChanged(frame);