mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-01-27 10:04:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed the audio glitches!!!

Browse Source
This commit is contained in:
Ryzerth 2021-07-13 18:47:34 +02:00
parent ff38cefe11
commit 4a5a29a59a
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/dsp/resampling.h
View File

@ -113,28 +113,39 @@ namespace dsp {
return -1; return -1;
} }
int outCount = calcOutSize(count);
memcpy(&buffer[tapsPerPhase], _in->readBuf, count * sizeof(T)); memcpy(&buffer[tapsPerPhase], _in->readBuf, count * sizeof(T));
_in->flush(); _in->flush();
// Write to output // Write to output
int outIndex = 0; int outIndex = 0;
int _interp_m_1 = _interp - 1; int inOffset = offset;
int _counter = counter;
if constexpr (std::is_same_v<T, float>) { if constexpr (std::is_same_v<T, float>) {
for (int i = 0; outIndex < outCount; i += _decim) { while (inOffset < count) {
int phase = i % _interp; volk_32f_x2_dot_prod_32f(&out.writeBuf[outIndex++], &buffer[inOffset], tapPhases[_counter], tapsPerPhase);
volk_32f_x2_dot_prod_32f(&out.writeBuf[outIndex], &buffer[i / _interp], tapPhases[phase], tapsPerPhase); _counter += _decim;
outIndex++; while (_counter >= _interp) {
_counter -= _interp;
inOffset++;
}
} }
} }
if constexpr (std::is_same_v<T, complex_t> || std::is_same_v<T, stereo_t>) { if constexpr (std::is_same_v<T, complex_t> || std::is_same_v<T, stereo_t>) {
for (int i = 0; outIndex < outCount; i += _decim) { while (inOffset < count) {
int phase = i % _interp; volk_32fc_32f_dot_prod_32fc((lv_32fc_t*)&out.writeBuf[outIndex++], (lv_32fc_t*)&buffer[inOffset], tapPhases[_counter], tapsPerPhase);
volk_32fc_32f_dot_prod_32fc((lv_32fc_t*)&out.writeBuf[outIndex], (lv_32fc_t*)&buffer[(i / _interp)], tapPhases[phase], tapsPerPhase); _counter += _decim;
outIndex++; while (_counter >= _interp) {
_counter -= _interp;
inOffset++;
}
} }
} }
if (!out.swap(outCount)) { return -1; }
if (!out.swap(outIndex)) { return -1; }
offset = inOffset - count;
counter = _counter;
memmove(buffer, &buffer[count], tapsPerPhase * sizeof(T)); memmove(buffer, &buffer[count], tapsPerPhase * sizeof(T));
@ -193,6 +204,9 @@ namespace dsp {
float _inSampleRate, _outSampleRate; float _inSampleRate, _outSampleRate;
float* taps; float* taps;
int counter = 0;
int offset = 0;
int tapsPerPhase; int tapsPerPhase;
std::vector<float*> tapPhases; std::vector<float*> tapPhases;