VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-05 14:47:50 -04:00
Code Issues Projects Releases Wiki Activity

Sample MIMO FIFO fixes

Browse Source
This commit is contained in:
f4exb 2019-09-26 23:50:16 +02:00
parent 55d33960d5
commit 25777c90d3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdrbase/dsp/samplemififo.cpp
View File

@ -56,24 +56,21 @@ void SampleMIFifo::writeSync(const std::vector<SampleVector::const_iterator>& vb
} }
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);
std::vector<SampleVector>::iterator dataIt = m_data.begin();
std::vector<SampleVector::const_iterator>::const_iterator vbeginIt = vbegin.begin();
int stream = 0;
for (; dataIt != m_data.end(); ++dataIt, ++vbeginIt, ++stream) for (unsigned int stream = 0; stream < m_data.size(); stream++)
{ {
int spaceLeft = dataIt->size() - m_vFill[stream]; int spaceLeft = m_data[stream].size() - m_vFill[stream];
if (size < spaceLeft) if (size < spaceLeft)
{ {
std::copy(*vbeginIt, *vbeginIt + size, dataIt->begin() + m_vFill[stream]); std::copy(vbegin[stream], vbegin[stream] + size, m_data[stream].begin() + m_vFill[stream]);
m_vFill[stream] += size; m_vFill[stream] += size;
} }
else else
{ {
int remaining = size - spaceLeft; int remaining = size - spaceLeft;
std::copy(*vbeginIt, *vbeginIt + spaceLeft, dataIt->begin() + m_vFill[stream]); std::copy(vbegin[stream], vbegin[stream] + spaceLeft, m_data[stream].begin() + m_vFill[stream]);
std::copy(*vbeginIt + spaceLeft, *vbeginIt + size, dataIt->begin()); std::copy(vbegin[stream] + spaceLeft, vbegin[stream] + size, m_data[stream].begin());
m_vFill[stream] = remaining; m_vFill[stream] = remaining;
} }
} }