Browse Source

Merge pull request #3031 from slomkowski/audioinput-fifo-race

AudioInputDevice: guard the FIFO list against concurrent changes
chirpmodem-v8.0.0
Edouard Griffiths 1 month ago committed by GitHub
parent
commit
4a78beb3a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 7
      sdrbase/audio/audioinputdevice.cpp
  2. 4
      sdrbase/audio/audioinputdevice.h

7
sdrbase/audio/audioinputdevice.cpp

@ -187,14 +187,14 @@ void AudioInputDevice::stop() @@ -187,14 +187,14 @@ void AudioInputDevice::stop()
void AudioInputDevice::addFifo(AudioFifo* audioFifo)
{
QMutexLocker mutexLocker(&m_mutex);
QMutexLocker mutexLocker(&m_fifosMutex);
m_audioFifos.push_back(audioFifo);
}
void AudioInputDevice::removeFifo(AudioFifo* audioFifo)
{
QMutexLocker mutexLocker(&m_mutex);
QMutexLocker mutexLocker(&m_fifosMutex);
m_audioFifos.remove(audioFifo);
}
@ -230,6 +230,9 @@ qint64 AudioInputDevice::writeData(const char *data, qint64 len) @@ -230,6 +230,9 @@ qint64 AudioInputDevice::writeData(const char *data, qint64 len)
return 0;
}
// FIFOs are added and removed from other threads (e.g. a modulator being started)
QMutexLocker mutexLocker(&m_fifosMutex);
for (std::list<AudioFifo*>::iterator it = m_audioFifos.begin(); it != m_audioFifos.end(); ++it)
{
(*it)->write(reinterpret_cast<const quint8*>(data), len/4);

4
sdrbase/audio/audioinputdevice.h

@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#ifndef SDRBASE_AUDIO_AUDIOINPUTDEVICE_H_
#define SDRBASE_AUDIO_AUDIOINPUTDEVICE_H_
#include <QMutex>
#include <QRecursiveMutex>
#include <QIODevice>
#include <QAudioFormat>
@ -114,7 +115,7 @@ public: @@ -114,7 +115,7 @@ public:
void addFifo(AudioFifo* audioFifo);
void removeFifo(AudioFifo* audioFifo);
int getNbFifos() const { return m_audioFifos.size(); }
int getNbFifos() const { QMutexLocker mutexLocker(&m_fifosMutex); return m_audioFifos.size(); }
uint getRate() const { return m_audioFormat.sampleRate(); }
void setOnExit(bool onExit) { m_onExit = onExit; }
@ -126,6 +127,7 @@ public: @@ -126,6 +127,7 @@ public:
private:
QRecursiveMutex m_mutex;
mutable QMutex m_fifosMutex; //!< guards m_audioFifos, which writeData reads on the audio thread
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QAudioSource* m_audioInput;
#else

Loading…
Cancel
Save