VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 19:22:27 -04:00
Code Issues Projects Releases Wiki Activity

Audio input: removed mutex lock on write data. Audio output: removed mutex lock on read data

Browse Source
This commit is contained in:
f4exb 2016-12-25 20:04:19 +01:00
parent e05822ba02
commit 53f6413bd9
2 changed files with 189 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdrbase/audio/audioinput.cpp
View File

@ -155,10 +155,11 @@ qint64 AudioInput::readData(char* data, qint64 maxLen)
qint64 AudioInput::writeData(const char *data, qint64 len) qint64 AudioInput::writeData(const char *data, qint64 len)
{ {
// @TODO: Study this mutex on OSX, for now deadlocks possible // Study this mutex on OSX, for now deadlocks possible
#ifndef __APPLE__ // Removed as it may indeed cause lockups and is in fact useless.
QMutexLocker mutexLocker(&m_mutex); //#ifndef __APPLE__
#endif // QMutexLocker mutexLocker(&m_mutex);
//#endif
if ((m_audioFormat.sampleSize() != 16) if ((m_audioFormat.sampleSize() != 16)
|| (m_audioFormat.sampleType() != QAudioFormat::SignedInt) || (m_audioFormat.sampleType() != QAudioFormat::SignedInt)

9
sdrbase/audio/audiooutput.cpp
View File

@ -158,10 +158,11 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen)
{ {
//qDebug("AudioOutput::readData: %lld", maxLen); //qDebug("AudioOutput::readData: %lld", maxLen);
// @TODO: Study this mutex on OSX, for now deadlocks possible // Study this mutex on OSX, for now deadlocks possible
#ifndef __APPLE__ // Removed as it may indeed cause lockups and is in fact useless.
QMutexLocker mutexLocker(&m_mutex); //#ifndef __APPLE__
#endif // QMutexLocker mutexLocker(&m_mutex);
//#endif
unsigned int framesPerBuffer = maxLen / 4; unsigned int framesPerBuffer = maxLen / 4;