Android: Move clean up AndroidTextureThread to its destructor

AndroidTextureThread should properly clean itself instead of expecting
the owner to do it. It is needed especialy when AndroidTextureThread
will be shared.

Change-Id: I55603e73da5b3621385c7ce72b51242763dd1b4c
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit c59c642181a8bd265817793e0e44d87aaf6c01e5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 15 insertions, 7 deletions

diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp
index 4afb119ee..bb2a10dee 100644
--- a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp
+++ b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp
@@ -254,7 +254,21 @@ class AndroidTextureThread : public QThread
 {
     Q_OBJECT
 public:
-    AndroidTextureThread() : QThread() {}
+    AndroidTextureThread() : QThread() {
+    }
+
+    ~AndroidTextureThread() {
+        QMetaObject::invokeMethod(this,
+                &AndroidTextureThread::clearSurfaceTexture, Qt::BlockingQueuedConnection);
+        this->quit();
+        this->wait();
+    }
+
+    void start()
+    {
+        QThread::start();
+        moveToThread(this);
+    }
 
     void initRhi(QOpenGLContext *context)
     {
@@ -341,17 +355,11 @@ QAndroidTextureVideoOutput::QAndroidTextureVideoOutput(QVideoSink *sink, QObject
     m_surfaceThread = std::make_unique<AndroidTextureThread>();
     connect(m_surfaceThread.get(), &AndroidTextureThread::newFrame,
             this, &QAndroidTextureVideoOutput::newFrame);
-
     m_surfaceThread->start();
-    m_surfaceThread->moveToThread(m_surfaceThread.get());
 }
 
 QAndroidTextureVideoOutput::~QAndroidTextureVideoOutput()
 {
-    QMetaObject::invokeMethod(m_surfaceThread.get(),
-            &AndroidTextureThread::clearSurfaceTexture, Qt::BlockingQueuedConnection);
-    m_surfaceThread->quit();
-    m_surfaceThread->wait();
 }
 
 void QAndroidTextureVideoOutput::setSubtitle(const QString &subtitle)