From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Wed, 26 Feb 2014 18:00:05 +0000 (+0100)
Subject: videonode: imx6: clear texture cache when the format changes
X-Git-Tag: upstream/5.2.90+alpha~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e280e78e2fe0f0417ca284f6b0d7a536a970bfd;p=platform%2Fupstream%2Fqtmultimedia.git

videonode: imx6: clear texture cache when the format changes

The old textures won't match anyways. So there is no need to keep them.

Change-Id: Id3482333d10cf022d04076ec0f5c7df475c522ae
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---

diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
index 0ed4e1a..44f9f4d 100644
--- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
+++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
@@ -56,6 +56,9 @@
 
 QSGVivanteVideoMaterial::QSGVivanteVideoMaterial() :
     mOpacity(1.0),
+    mWidth(0),
+    mHeight(0),
+    mFormat(QVideoFrame::Format_Invalid),
     mCurrentTexture(0)
 {
 #ifdef QT_VIVANTE_VIDEO_DEBUG
@@ -147,6 +150,18 @@ GLuint QSGVivanteVideoMaterial::vivanteMapping(QVideoFrame vF)
         return 0;
     }
 
+    if (mWidth != vF.width() || mHeight != vF.height() || mFormat != vF.pixelFormat()) {
+        mWidth = vF.width();
+        mHeight = vF.height();
+        mFormat = vF.pixelFormat();
+        for (GLuint id : mBitsToTextureMap.values()) {
+#ifdef QT_VIVANTE_VIDEO_DEBUG
+            qDebug() << "delete texture: " << id;
+#endif
+            glDeleteTextures(1, &id);
+        }
+        mBitsToTextureMap.clear();
+    }
 
     if (vF.map(QAbstractVideoBuffer::ReadOnly)) {
 
diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.h b/src/plugins/videonode/imx6/qsgvivantevideomaterial.h
index 9d792b7..0c1c445 100644
--- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.h
+++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.h
@@ -70,6 +70,10 @@ public:
 private:
     qreal mOpacity;
 
+    int mWidth;
+    int mHeight;
+    QVideoFrame::PixelFormat mFormat;
+
     QMap<const uchar*, GLuint> mBitsToTextureMap;
     QVideoFrame mCurrentFrame, mNextFrame;
     GLuint mCurrentTexture;