diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-04 21:40:02 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-04 21:40:02 +0100 |
commit | 34d15785600f98faa4a51827b452d6c488e4c10c (patch) | |
tree | e4dd1b11602f0b13bedd895df254a69fa9187fc0 /src/plugins/common | |
parent | 46b10ce610cfa3957ed4be719b9a7f3f1f39dcf0 (diff) | |
parent | 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 (diff) | |
download | qtmultimedia-34d15785600f98faa4a51827b452d6c488e4c10c.tar.gz |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5394a9d75850771068d43d2509b14a3ac4efcf83
Diffstat (limited to 'src/plugins/common')
-rw-r--r-- | src/plugins/common/evr/evrcustompresenter.cpp | 4 | ||||
-rw-r--r-- | src/plugins/common/evr/evrvideowindowcontrol.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/common/evr/evrcustompresenter.cpp b/src/plugins/common/evr/evrcustompresenter.cpp index dd03791ea..fdaedea7a 100644 --- a/src/plugins/common/evr/evrcustompresenter.cpp +++ b/src/plugins/common/evr/evrcustompresenter.cpp @@ -1927,12 +1927,12 @@ void EVRCustomPresenter::presentSample(IMFSample *sample) return; } - if (!m_surface || !m_surface->isActive() || !m_presentEngine->videoSurfaceFormat().isValid()) + if (!m_surface || !m_presentEngine->videoSurfaceFormat().isValid()) return; QVideoFrame frame = m_presentEngine->makeVideoFrame(sample); - if (m_surface->isActive() && m_surface->surfaceFormat() != m_presentEngine->videoSurfaceFormat()) { + if (!m_surface->isActive() || m_surface->surfaceFormat() != m_presentEngine->videoSurfaceFormat()) { m_surface->stop(); if (!m_surface->start(m_presentEngine->videoSurfaceFormat())) return; diff --git a/src/plugins/common/evr/evrvideowindowcontrol.cpp b/src/plugins/common/evr/evrvideowindowcontrol.cpp index ce837c553..95f63c2e7 100644 --- a/src/plugins/common/evr/evrvideowindowcontrol.cpp +++ b/src/plugins/common/evr/evrvideowindowcontrol.cpp @@ -158,6 +158,9 @@ void EvrVideoWindowControl::setDisplayRect(const QRect &rect) } else { m_displayControl->SetVideoPosition(NULL, &displayRect); } + + // To refresh content immediately. + repaint(); } } |