VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 13:32:26 -04:00
Code Issues Projects Releases Wiki Activity

MO FIFO: limit read count to FIFO size

Browse Source
This commit is contained in:
f4exb 2019-11-17 03:16:24 +01:00
parent 6533df15f5
commit 85444b0304
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdrbase/dsp/samplemofifo.cpp
View File

@ -83,7 +83,7 @@ void SampleMOFifo::readSync(
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
unsigned int spaceLeft = m_size - m_readHead; unsigned int spaceLeft = m_size - m_readHead;
m_readCount += amount; m_readCount = m_readCount + amount < m_size ? m_readCount + amount : m_size; // cannot exceed FIFO size
if (amount <= spaceLeft) if (amount <= spaceLeft)
{ {
@ -146,7 +146,7 @@ void SampleMOFifo::writeSync(
m_writeHead = remaining; m_writeHead = remaining;
} }
m_readCount = amount < m_readCount ? m_readCount - amount : 0; m_readCount = amount < m_readCount ? m_readCount - amount : 0; // cannot be less than 0
} }
void SampleMOFifo::readAsync( void SampleMOFifo::readAsync(
@ -158,7 +158,7 @@ void SampleMOFifo::readAsync(
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
unsigned int spaceLeft = m_size - m_vReadHead[stream]; unsigned int spaceLeft = m_size - m_vReadHead[stream];
m_vReadCount[stream] += amount; m_vReadCount[stream] = m_vReadCount[stream] + amount < m_size ? m_vReadCount[stream] + amount : m_size; // cannot exceed FIFO size
if (amount <= spaceLeft) if (amount <= spaceLeft)
{ {
@ -225,7 +225,7 @@ void SampleMOFifo::writeAsync( //!< in place write with given amount
m_vWriteHead[stream] = remaining; m_vWriteHead[stream] = remaining;
} }
m_vReadCount[stream] = amount < m_vReadCount[stream] ? m_vReadCount[stream] - amount : 0; m_vReadCount[stream] = amount < m_vReadCount[stream] ? m_vReadCount[stream] - amount : 0; // cannot be less than 0
} }
unsigned int SampleMOFifo::getSizePolicy(unsigned int sampleRate) unsigned int SampleMOFifo::getSizePolicy(unsigned int sampleRate)