From 6376640a902eee509bce7ddb66d04cfa98f690a4 Mon Sep 17 00:00:00 2001
From: Piotr Srebrny <piotr.srebrny@qt.io>
Date: Wed, 22 Jun 2022 13:06:57 +0200
Subject: Adjust video output size by frame orientation

The reported QQuickVideoOutput::sourceRect() size was incorrect as
it did not take the frame orientation into account. This was caught by
Q_ASSERT. The bug was found and solved by Vladimir Belyavsky.

Fixes: QTBUG-104483
Change-Id: Icffa7e69a60b434f85f25604297ebea5ed4dd316
Reviewed-by: Lars Knoll <lars.knoll@gmail.com>
(cherry picked from commit a573a6f507b8b63a8a868adb5d97c21bc7849ae6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/multimediaquick/qquickvideooutput.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/multimediaquick/qquickvideooutput.cpp b/src/multimediaquick/qquickvideooutput.cpp
index fe2119e61..bbaa42e9f 100644
--- a/src/multimediaquick/qquickvideooutput.cpp
+++ b/src/multimediaquick/qquickvideooutput.cpp
@@ -356,7 +356,7 @@ QRectF QQuickVideoOutput::sourceRect() const
     if (!size.isValid())
         return {};
 
-    if (!qIsDefaultAspect(m_orientation))
+    if (!qIsDefaultAspect(m_orientation + m_frameOrientation))
         size.transpose();
 
 
-- 
cgit v1.2.3