Android: Unnecessary QMutex functionality removed

Mutex on android side is unnecessary because,
all the elements it guards are access only from one thread.

Task-number: QTBUG-100079
Change-Id: Idd4035ef52e64415c2b63d9c62612e95217f88cc
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 51a548f8da473de731471ea784975a5f84c58b6a)

2 files changed, 0 insertions, 12 deletions

diff --git a/src/multimedia/platform/android/audio/qandroidaudiodecoder.cpp b/src/multimedia/platform/android/audio/qandroidaudiodecoder.cpp
index 1d7c03346..f56cced6a 100644
--- a/src/multimedia/platform/android/audio/qandroidaudiodecoder.cpp
+++ b/src/multimedia/platform/android/audio/qandroidaudiodecoder.cpp
@@ -343,16 +343,13 @@ void QAndroidAudioDecoder::stop()
     if (m_threadDecoder && m_threadDecoder->isRunning())
         m_threadDecoder->exit();
 
-    QMutexLocker locker(&m_buffersMutex);
     m_position = -1;
     m_audioBuffer.clear();
-    locker.unlock();
     setIsDecoding(false);
 }
 
 QAudioBuffer QAndroidAudioDecoder::read()
 {
-    QMutexLocker locker(&m_buffersMutex);
     if (m_buffersAvailable && !m_audioBuffer.isEmpty()) {
         --m_buffersAvailable;
         return m_audioBuffer.takeFirst();
@@ -364,38 +361,31 @@ QAudioBuffer QAndroidAudioDecoder::read()
 
 bool QAndroidAudioDecoder::bufferAvailable() const
 {
-    QMutexLocker locker(&m_buffersMutex);
     return m_buffersAvailable;
 }
 
 qint64 QAndroidAudioDecoder::position() const
 {
-    QMutexLocker locker(&m_buffersMutex);
     return m_position;
 }
 
 qint64 QAndroidAudioDecoder::duration() const
 {
-    QMutexLocker locker(&m_buffersMutex);
     return m_duration;
 }
 
 void QAndroidAudioDecoder::positionChanged(QAudioBuffer audioBuffer, qint64 position)
 {
-    QMutexLocker locker(&m_buffersMutex);
     m_audioBuffer.append(audioBuffer);
     m_position = position;
     m_buffersAvailable++;
-    locker.unlock();
     emit bufferReady();
     emit QPlatformAudioDecoder::positionChanged(position);
 }
 
 void QAndroidAudioDecoder::durationChanged(qint64 duration)
 {
-    QMutexLocker locker(&m_buffersMutex);
     m_duration = duration;
-    locker.unlock();
     emit QPlatformAudioDecoder::durationChanged(duration);
 }
 
diff --git a/src/multimedia/platform/android/audio/qandroidaudiodecoder_p.h b/src/multimedia/platform/android/audio/qandroidaudiodecoder_p.h
index 07a3aff3a..29e43ebae 100644
--- a/src/multimedia/platform/android/audio/qandroidaudiodecoder_p.h
+++ b/src/multimedia/platform/android/audio/qandroidaudiodecoder_p.h
@@ -53,7 +53,6 @@
 #include "private/qplatformaudiodecoder_p.h"
 
 #include <QtCore/qurl.h>
-#include <QtCore/qmutex.h>
 #include <QThread>
 
 #include "media/NdkMediaCodec.h"
@@ -137,7 +136,6 @@ private:
     QList<QAudioBuffer> m_audioBuffer;
     QUrl m_source;
 
-    mutable QMutex m_buffersMutex;
     qint64 m_position = -1;
     qint64 m_duration = -1;
     long long m_presentationTimeUs = 0;