diff options
author | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
commit | 32e49d634c5892ed98074cb3dd76a323357dfe54 (patch) | |
tree | 252495f053b0084da47894ce1daee460abe40718 /src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | |
parent | 5825dd2773755cea236d9816cc7541bc20f9cb80 (diff) | |
parent | d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/plugins/directshow/player/directshowplayerservice.cpp
Change-Id: I482098bb3c3b5b291175ca798b0d6ba61ad87d86
Diffstat (limited to 'src/qtmultimediaquicktools/qdeclarativevideooutput.cpp')
-rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index 4ef605e28..18cf0e927 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -411,8 +411,13 @@ void QDeclarativeVideoOutput::_q_updateGeometry() m_contentRect.moveCenter(rect.center()); } - if (m_backend) - m_backend->updateGeometry(); + if (m_backend) { + if (!m_backend->videoSurface() || m_backend->videoSurface()->isActive()) + m_backend->updateGeometry(); + else + m_geometryDirty = true; + } + if (m_contentRect != oldContentRect) emit contentRectChanged(); |