Suspend DSA while drawing is in progress

In order to prevent flicker or - on some versions of the platform -
video disappearing from the screen altogether, the video controller's
DSA session must be suspended while the window control is redrawn.

Task-number: QTBUG-5467
Reviewed-by: Jason Barron

1 files changed, 16 insertions, 0 deletions

diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index f16f332..119dcb1 100644
--- a/src/3rdparty/phonon/mmf/videooutput.cpp
+++ b/src/3rdparty/phonon/mmf/videooutput.cpp
@@ -34,6 +34,8 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <coecntrl.h>
 
+#include <coemain.h>    // for CCoeEnv
+
 QT_BEGIN_NAMESPACE
 
 using namespace Phonon;
@@ -73,6 +75,7 @@ MMF::VideoOutput::VideoOutput
     setAutoFillBackground(false);
 
     qt_widget_private(this)->extraData()->nativePaintMode = QWExtra::ZeroFill;
+    qt_widget_private(this)->extraData()->receiveNativePaintEvents = true;
 
     getVideoWindowRect();
     registerForAncestorMoved();
@@ -283,5 +286,18 @@ void MMF::VideoOutput::dump() const
 #endif
 }
 
+void MMF::VideoOutput::beginNativePaintEvent(const QRect& /*controlRect*/)
+{
+    emit beginVideoWindowNativePaint();
+}
+
+void MMF::VideoOutput::endNativePaintEvent(const QRect& /*controlRect*/)
+{
+    // Ensure that draw ops are executed into the WSERV output framebuffer
+    CCoeEnv::Static()->WsSession().Flush();
+
+    emit endVideoWindowNativePaint();
+}
+
 QT_END_NAMESPACE