VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-15 20:28:52 -04:00
Code Issues Projects Releases Wiki Activity

PVS-Studio Analysis corrections for serious issues

Browse Source
This commit is contained in:
f4exb
2018-11-18 09:39:22 +01:00
parent bc50bf9afa
commit 059228e39f
12 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/bladerf1input/bladerf1inputgui.cpp
+1 -5
View File
@@ -463,14 +463,10 @@ unsigned int Bladerf1InputGui::getXb200Index(bool xb_200, bladerf_xb200_path xb2
{
return 6;
}
else if (xb200Filter == BLADERF_XB200_222M)
else // xb200Filter == BLADERF_XB200_222M
{
return 7;
}
else
{
return 0;
}
}
}
else
plugins/samplesource/bladerf2input/bladerf2input.cpp
+10
View File
@@ -329,6 +329,11 @@ bool BladeRF2Input::start()
((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_source->setThread(0);
}
// was used as temporary storage:
delete[] fifos;
delete[] log2Decims;
delete[] fcPoss;
needsStart = true;
}
else
@@ -470,6 +475,11 @@ void BladeRF2Input::stop()
if (stillActiveFIFO) {
bladerf2InputThread->startWork();
}
// was used as temporary storage:
delete[] fifos;
delete[] log2Decims;
delete[] fcPoss;
}
else // remove channel from existing thread
{
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp
+9 -9
View File
@@ -262,13 +262,7 @@ void SDRdaemonSourceUDPHandler::tick()
const SDRDaemonMetaDataFEC& metaData = m_sdrDaemonBuffer.getCurrentMeta();
m_readLength = m_readLengthSamples * (metaData.m_sampleBytes & 0xF) * 2;
if (SDR_RX_SAMP_SZ == metaData.m_sampleBits) // same sample size
{
// read samples directly feeding the SampleFifo (no callback)
m_sampleFifo->write(reinterpret_cast<quint8*>(m_sdrDaemonBuffer.readData(m_readLength)), m_readLength);
m_samplesCount += m_readLengthSamples;
}
else if (metaData.m_sampleBits == 16) // 16 -> 24 bits
if ((metaData.m_sampleBits == 16) && (SDR_RX_SAMP_SZ == 24)) // 16 -> 24 bits
{
if (m_readLengthSamples > m_converterBufferNbSamples)
{
@@ -288,7 +282,7 @@ void SDRdaemonSourceUDPHandler::tick()
m_sampleFifo->write(reinterpret_cast<quint8*>(m_converterBuffer), m_readLengthSamples*sizeof(Sample));
}
else if (metaData.m_sampleBits == 24) // 24 -> 16 bits
else if ((metaData.m_sampleBits == 24) && (SDR_RX_SAMP_SZ == 16)) // 24 -> 16 bits
{
if (m_readLengthSamples > m_converterBufferNbSamples)
{
@@ -307,7 +301,13 @@ void SDRdaemonSourceUDPHandler::tick()
m_sampleFifo->write(reinterpret_cast<quint8*>(m_converterBuffer), m_readLengthSamples*sizeof(Sample));
}
else
else if ((metaData.m_sampleBits == 16) || (metaData.m_sampleBits == 24)) // same sample size and valid size
{
// read samples directly feeding the SampleFifo (no callback)
m_sampleFifo->write(reinterpret_cast<quint8*>(m_sdrDaemonBuffer.readData(m_readLength)), m_readLength);
m_samplesCount += m_readLengthSamples;
}
else // invalid size
{
qWarning("SDRdaemonSourceUDPHandler::tick: unexpected sample size in stream: %d bits", (int) metaData.m_sampleBits);
}