Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I5394a9d75850771068d43d2509b14a3ac4efcf83

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();
     }
 }