lili/ggwave
1
0
Fork 0
mirror of https://github.com/ggerganov/ggwave.git synced 2026-04-20 05:06:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

ggwave : reduce memory usage for fixed length decoding

Browse Source
This commit is contained in:
Georgi Gerganov
2022-05-29 22:12:06 +03:00
parent 6888ca58f2
commit 62e54102ed
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/arduino-rx/arduino-rx.ino
View File

@@ -52,7 +52,7 @@ void loop() {
p.sampleRate = frequency; p.sampleRate = frequency;
p.sampleFormatInp = GGWAVE_SAMPLE_FORMAT_I16; p.sampleFormatInp = GGWAVE_SAMPLE_FORMAT_I16;
p.samplesPerFrame = 128; p.samplesPerFrame = 128;
p.payloadLength = 4; p.payloadLength = 16;
p.operatingMode = GGWAVE_OPERATING_MODE_RX; p.operatingMode = GGWAVE_OPERATING_MODE_RX;
GGWave ggwave(p); GGWave ggwave(p);

10
src/ggwave.cpp
View File

@@ -389,7 +389,7 @@ struct GGWave::Rx {
int historyIdFixed = 0; int historyIdFixed = 0;
std::vector<SpectrumData> spectrumHistoryFixed; std::vector<std::vector<uint8_t>> spectrumHistoryFixed;
std::vector<uint8_t> detectedBins; std::vector<uint8_t> detectedBins;
std::vector<uint8_t> detectedTones; std::vector<uint8_t> detectedTones;
}; };
@@ -1675,14 +1675,20 @@ void GGWave::decode_fixed() {
// calculate spectrum // calculate spectrum
FFT(m_rx->sampleAmplitude.data(), m_rx->fftOut.data(), m_samplesPerFrame, 1.0); FFT(m_rx->sampleAmplitude.data(), m_rx->fftOut.data(), m_samplesPerFrame, 1.0);
float amax = 0.0f;
for (int i = 0; i < m_samplesPerFrame; ++i) { for (int i = 0; i < m_samplesPerFrame; ++i) {
m_rx->sampleSpectrum[i] = (m_rx->fftOut[2*i + 0]*m_rx->fftOut[2*i + 0] + m_rx->fftOut[2*i + 1]*m_rx->fftOut[2*i + 1]); m_rx->sampleSpectrum[i] = (m_rx->fftOut[2*i + 0]*m_rx->fftOut[2*i + 0] + m_rx->fftOut[2*i + 1]*m_rx->fftOut[2*i + 1]);
} }
for (int i = 1; i < m_samplesPerFrame/2; ++i) { for (int i = 1; i < m_samplesPerFrame/2; ++i) {
m_rx->sampleSpectrum[i] += m_rx->sampleSpectrum[m_samplesPerFrame - i]; m_rx->sampleSpectrum[i] += m_rx->sampleSpectrum[m_samplesPerFrame - i];
amax = std::max(amax, m_rx->sampleSpectrum[i]);
} }
m_rx->spectrumHistoryFixed[m_rx->historyIdFixed] = m_rx->sampleSpectrum; // float -> uint8_t
//m_rx->spectrumHistoryFixed[m_rx->historyIdFixed] = m_rx->sampleSpectrum;
for (int i = 0; i < m_samplesPerFrame; ++i) {
m_rx->spectrumHistoryFixed[m_rx->historyIdFixed][i] = std::min(255.0f, std::max(0.0f, std::round(m_rx->sampleSpectrum[i]/amax*255.0f)));
}
if (++m_rx->historyIdFixed >= (int) m_rx->spectrumHistoryFixed.size()) { if (++m_rx->historyIdFixed >= (int) m_rx->spectrumHistoryFixed.size()) {
m_rx->historyIdFixed = 0; m_rx->historyIdFixed = 0;