diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-10-17 15:44:19 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-10-18 09:21:19 +0200 |
| commit | 1d57fe25c039f76088df5c63d4198da5d61af5ca (patch) | |
| tree | 0bd4b456b035076b756de0fa21a65b55b8bcb2a1 /src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | |
| parent | 73a4ff93f4977b191728a6bc50ff6a5efa28f4f3 (diff) | |
VideoOutput: fix resize of a finished video
Commit d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd introduced a fix for
video startup. However, after this change, the VideoOutput was no
longer updating its geomerty after the video playback is finished.
This patch partly reverts the aforementioned commit, triggering
backend geometry update unconditionally. However, to keep the fix of
QTBUG-76205 valid, the m_geometryDirty flag is set to true under the
same conditions as in the original patch.
This will potentially lead to more m_backend->geometryUpdate() calls
than before, but should generally be fine.
Fixes: QTBUG-106059
Task-number: QTBUG-76205
Change-Id: I4e5d8aeef2b8bcc4596f73571cb7a2d3ec5d3200
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'src/qtmultimediaquicktools/qdeclarativevideooutput.cpp')
| -rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index 449b8af92..1f7f9c9ab 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -421,9 +421,8 @@ void QDeclarativeVideoOutput::_q_updateGeometry() } if (m_backend) { - if (!m_backend->videoSurface() || m_backend->videoSurface()->isActive()) - m_backend->updateGeometry(); - else + m_backend->updateGeometry(); + if (m_backend->videoSurface() && !m_backend->videoSurface()->isActive()) m_geometryDirty = true; } |