VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Morse Decoder: set buffer size to analysis time window (3s)

This commit is contained in:
f4exb 2024-05-20 22:46:39 +02:00
parent 1edaa0d98a
commit eb877fa7c7
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
plugins/feature/morsedecoder/morsedecoderworker.cpp
View File

@ -101,15 +101,22 @@ void MorseDecoderWorker::feedPart(
int bytesLeft = m_bytesBufferSize - m_bytesBufferCount; int bytesLeft = m_bytesBufferSize - m_bytesBufferCount;
if (countBytes > m_bytesBufferSize) { if (countBytes > m_bytesBufferSize) {
qDebug("MorseDecoderWorker::feedPart: countBytes: %d m_bytesBufferSize: %d",
countBytes, m_bytesBufferSize);
return; return;
} }
if (countBytes >= bytesLeft) if (countBytes >= bytesLeft)
{ {
std::copy(begin, begin + bytesLeft, m_bytesBuffer.begin() + m_bytesBufferCount); // fill buffer std::copy(begin, begin + bytesLeft, m_bytesBuffer.begin() + m_bytesBufferCount); // fill buffer
int unprocessedBytes = processBuffer(m_bytesBuffer, countBytes); int unprocessedBytes = processBuffer(m_bytesBuffer);
std::copy(begin + bytesLeft - unprocessedBytes, end, m_bytesBuffer.begin()); std::copy(begin + bytesLeft - unprocessedBytes, end, m_bytesBuffer.begin());
m_bytesBufferCount = bytesLeft + unprocessedBytes; if (m_bytesBufferCount + bytesLeft != (int) m_bytesBuffer.size()) {
qDebug("MorseDecoderWorker::feedPart: countBytes: %d bytesLeft: %d m_bytesBufferCount: %d unprocessedBytes: %d",
countBytes, bytesLeft, m_bytesBufferCount, unprocessedBytes);
}
int remBytes = end - (begin + bytesLeft - unprocessedBytes);
m_bytesBufferCount = remBytes;
} }
else else
{ {
@ -118,12 +125,38 @@ void MorseDecoderWorker::feedPart(
} }
} }
int MorseDecoderWorker::processBuffer(QByteArray& bytesBuffer, int countBytes) int MorseDecoderWorker::processBuffer(QByteArray& bytesBuffer)
{ {
uint32_t samplesHave = bytesBuffer.size() / 2; uint32_t samplesHave = bytesBuffer.size() / 2;
uint32_t samplesTotal = bytesBuffer.size() / 2; uint32_t samplesTotal = bytesBuffer.size() / 2;
int bytesLeft = 0; int bytesLeft = 0;
// // Input waveform
// if (m_scopeVis)
// {
// SampleVector strace;
// strace.resize(4800, 0);
// int nSamples = bytesBuffer.size() / 2;
// float ftrace = nSamples / 4800.0f;
// int i = 0;
// std::for_each(
// strace.begin(),
// strace.end(),
// [&](Sample& s)
// {
// int itrace = ftrace * i;
// int16_t *ps = (int16_t *) (bytesBuffer.data() + 2*itrace);
// float re = *ps / 32768.0f;
// i++;
// s = Sample(re*SDR_RX_SCALEF, 0);
// }
// );
// std::vector<SampleVector::const_iterator> vbegin;
// vbegin.push_back(strace.begin());
// m_scopeVis->feed(vbegin, 4800);
// }
GGMorse::CBWaveformInp cbWaveformInp = [&](void * data, uint32_t nMaxBytes) GGMorse::CBWaveformInp cbWaveformInp = [&](void * data, uint32_t nMaxBytes)
{ {
if (samplesHave*2 < nMaxBytes) if (samplesHave*2 < nMaxBytes)
@ -131,8 +164,8 @@ int MorseDecoderWorker::processBuffer(QByteArray& bytesBuffer, int countBytes)
if (samplesHave != 0) if (samplesHave != 0)
{ {
bytesLeft = samplesHave*2; bytesLeft = samplesHave*2;
qDebug("MorseDecoderWorker::processBuffer::cbWaveformInp: nMaxBytes: %u / %u samples left buffer size: %u countBytes: %d", // qDebug("MorseDecoderWorker::processBuffer::cbWaveformInp: nMaxBytes: %u / %u samples left buffer size: %u countBytes: %d",
nMaxBytes, samplesHave, bytesBuffer.size(), countBytes); // nMaxBytes, samplesHave, bytesBuffer.size(), countBytes);
} }
return 0; return 0;
@ -172,6 +205,7 @@ int MorseDecoderWorker::processBuffer(QByteArray& bytesBuffer, int countBytes)
m_msgQueueToFeature->push(msg); m_msgQueueToFeature->push(msg);
} }
// Goertzel output and thresholds
if (m_scopeVis) if (m_scopeVis)
{ {
std::vector<float> trace; std::vector<float> trace;
@ -314,7 +348,7 @@ void MorseDecoderWorker::applySampleRate(int sampleRate)
m_sinkSampleRate = sampleRate; m_sinkSampleRate = sampleRate;
m_ggMorseParameters->sampleRateInp = sampleRate; m_ggMorseParameters->sampleRateInp = sampleRate;
int ggMorseBlockSize = (sampleRate / GGMorse::kBaseSampleRate)*GGMorse::kDefaultSamplesPerFrame; int ggMorseBlockSize = (sampleRate / GGMorse::kBaseSampleRate)*GGMorse::kDefaultSamplesPerFrame;
m_bytesBufferSize = 64*ggMorseBlockSize*2; m_bytesBufferSize = sampleRate * GGMorse::kMaxWindowToAnalyze_s * 2;
m_bytesBuffer.resize(m_bytesBufferSize); m_bytesBuffer.resize(m_bytesBufferSize);
m_bytesBufferCount = 0; m_bytesBufferCount = 0;
float seconds = m_bytesBufferSize/(sampleRate*2.0f); float seconds = m_bytesBufferSize/(sampleRate*2.0f);

2
plugins/feature/morsedecoder/morsedecoderworker.h
View File

@ -145,7 +145,7 @@ private:
); );
bool handleMessage(const Message& cmd); bool handleMessage(const Message& cmd);
int processBuffer(QByteArray& bytesBuffer, int countBytes); //!< return the number of bytes left int processBuffer(QByteArray& bytesBuffer); //!< return the number of bytes left
// inline void processSample( // inline void processSample(
// DataFifo::DataType dataType, // DataFifo::DataType dataType,