diff options
| author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-06-22 13:06:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-06 06:54:35 +0000 |
| commit | 6376640a902eee509bce7ddb66d04cfa98f690a4 (patch) | |
| tree | cc624488d1a708f40fb6af4196718ce7c565dce7 | |
| parent | 7353f6ca11d9d2772829dea8e2ac09b913ab7023 (diff) | |
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>
| -rw-r--r-- | src/multimediaquick/qquickvideooutput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |