Fixed mapping video frames in SG nodes

Since it's possible to map video frame in R/O mode multiple times
it's always necessary to map it before accessing frame data.

Change-Id: I13f58085a0b19dba772e0b75c64d9f07d1ac2a58
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/src/imports/multimedia/qsgvideonode_i420.cpp b/src/imports/multimedia/qsgvideonode_i420.cpp
index fae2c8723..9886d712a 100644
--- a/src/imports/multimedia/qsgvideonode_i420.cpp
+++ b/src/imports/multimedia/qsgvideonode_i420.cpp
@@ -225,13 +225,8 @@ void QSGVideoMaterial_YUV420::bind()
     QOpenGLFunctions *functions = QOpenGLContext::currentContext()->functions();
 
     QMutexLocker lock(&m_frameMutex);
-    if (m_frame.isValid() && m_frame.map(QAbstractVideoBuffer::ReadOnly)) {
-        bool wasMapped = m_frame.isMapped();
-
-        if (!wasMapped)
-            m_frame.map(QAbstractVideoBuffer::ReadOnly);
-
-        if (m_frame.isMapped()) {
+    if (m_frame.isValid()) {
+        if (m_frame.map(QAbstractVideoBuffer::ReadOnly)) {
             int fw = m_frame.width();
             int fh = m_frame.height();
 
@@ -260,8 +255,7 @@ void QSGVideoMaterial_YUV420::bind()
             functions->glActiveTexture(GL_TEXTURE0); // Finish with 0 as default texture unit
             bindTexture(m_textureIds[0], fw, fh, bits);
 
-            if (!wasMapped)
-                m_frame.unmap();
+            m_frame.unmap();
         }
 
         m_frame = QVideoFrame();