VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00
Code Issues Projects Releases Wiki Activity

SampleSinkFIFO: read/write return immediately if size is zero. Fixes #868

Browse Source
This commit is contained in:
f4exb 2021-04-25 11:06:21 +02:00
parent f1c119a450
commit 8c9f5ff14c
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sdrbase/dsp/samplesinkfifo.cpp
View File

@ -22,7 +22,6 @@
void SampleSinkFifo::create(unsigned int s) void SampleSinkFifo::create(unsigned int s)
{ {
m_size = 0;
m_fill = 0; m_fill = 0;
m_head = 0; m_head = 0;
m_tail = 0; m_tail = 0;
@ -85,6 +84,11 @@ bool SampleSinkFifo::setSize(int size)
unsigned int SampleSinkFifo::write(const quint8* data, unsigned int count) unsigned int SampleSinkFifo::write(const quint8* data, unsigned int count)
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
if (m_size == 0) {
return 0;
}
unsigned int total; unsigned int total;
unsigned int remaining; unsigned int remaining;
unsigned int len; unsigned int len;
@ -139,6 +143,11 @@ unsigned int SampleSinkFifo::write(const quint8* data, unsigned int count)
unsigned int SampleSinkFifo::write(SampleVector::const_iterator begin, SampleVector::const_iterator end) unsigned int SampleSinkFifo::write(SampleVector::const_iterator begin, SampleVector::const_iterator end)
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
if (m_size == 0) {
return 0;
}
unsigned int count = end - begin; unsigned int count = end - begin;
unsigned int total; unsigned int total;
unsigned int remaining; unsigned int remaining;
@ -192,6 +201,11 @@ unsigned int SampleSinkFifo::write(SampleVector::const_iterator begin, SampleVec
unsigned int SampleSinkFifo::read(SampleVector::iterator begin, SampleVector::iterator end) unsigned int SampleSinkFifo::read(SampleVector::iterator begin, SampleVector::iterator end)
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
if (m_size == 0) {
return 0;
}
unsigned int count = end - begin; unsigned int count = end - begin;
unsigned int total; unsigned int total;
unsigned int remaining; unsigned int remaining;
@ -224,6 +238,11 @@ unsigned int SampleSinkFifo::readBegin(unsigned int count,
SampleVector::iterator* part2Begin, SampleVector::iterator* part2End) SampleVector::iterator* part2Begin, SampleVector::iterator* part2End)
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
if (m_size == 0) {
return 0;
}
unsigned int total; unsigned int total;
unsigned int remaining; unsigned int remaining;
unsigned int len; unsigned int len;
@ -271,6 +290,10 @@ unsigned int SampleSinkFifo::readCommit(unsigned int count)
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
if (m_size == 0) {
return 0;
}
if (count > m_fill) if (count > m_fill)
{ {
qCritical("SampleSinkFifo::readCommit: cannot commit more than available samples"); qCritical("SampleSinkFifo::readCommit: cannot commit more than available samples");
@ -286,4 +309,4 @@ unsigned int SampleSinkFifo::readCommit(unsigned int count)
unsigned int SampleSinkFifo::getSizePolicy(unsigned int sampleRate) unsigned int SampleSinkFifo::getSizePolicy(unsigned int sampleRate)
{ {
return (sampleRate/100)*64; // .64s return (sampleRate/100)*64; // .64s
} }