Android: Fix texture leak in QAndroidTextureVideoOutput

Simplify the ownership of the OpenGL resources and make it simpler
to release individual resources as needed. Previously we would
reset the texture handle without releasing it back to the system, making
us leak texture each time the video output was reset.

Also, be consistent with the type used for the texture handle.

Task-number: QTBUG-54340
Change-Id: Ic3b3c7322677a909e51aa5983fa99ccf8b290302
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp
index bc7187e9c..cd6d41d84 100644
--- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp
+++ b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp
@@ -56,7 +56,7 @@ static void notifyFrameAvailable(JNIEnv* , jobject, jlong id)
         Q_EMIT obj->frameAvailable();
 }
 
-AndroidSurfaceTexture::AndroidSurfaceTexture(unsigned int texName)
+AndroidSurfaceTexture::AndroidSurfaceTexture(quint32 texName)
     : QObject()
 {
     Q_STATIC_ASSERT(sizeof (jlong) >= sizeof (void *));
@@ -157,7 +157,7 @@ jobject AndroidSurfaceTexture::surfaceHolder()
     return m_surfaceHolder.object();
 }
 
-void AndroidSurfaceTexture::attachToGLContext(int texName)
+void AndroidSurfaceTexture::attachToGLContext(quint32 texName)
 {
     if (QtAndroidPrivate::androidSdkVersion() < 16 || !m_surfaceTexture.isValid())
         return;
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h
index 3c41bf51d..1b82ad20e 100644
--- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h
+++ b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h
@@ -45,7 +45,7 @@ class AndroidSurfaceTexture : public QObject
 {
     Q_OBJECT
 public:
-    explicit AndroidSurfaceTexture(unsigned int texName);
+    explicit AndroidSurfaceTexture(quint32 texName);
     ~AndroidSurfaceTexture();
 
     jobject surfaceTexture();
@@ -57,7 +57,7 @@ public:
     void release(); // API level 14
     void updateTexImage();
 
-    void attachToGLContext(int texName); // API level 16
+    void attachToGLContext(quint32 texName); // API level 16
     void detachFromGLContext(); // API level 16
 
     static bool initJNI(JNIEnv *env);