mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-26 12:27:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code cleanup and optimisation$

Browse Source
This commit is contained in:
AlexandreRouma
2022-07-08 17:30:43 +02:00
parent 3ab8badb6a
commit 30b6c2b1da
2 changed files with 15 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/dsp/audio/volume.h
View File

@ -13,7 +13,6 @@ namespace dsp::audio {
void init(stream<stereo_t>* in, double volume, bool muted) {
_volume = powf(volume, 2);
_muted = muted;
level = { -150.0f, -150.0f };
base_type::init(in);
}
@ -35,41 +34,8 @@ namespace dsp::audio {
return _muted;
}
stereo_t getOutputLevel() {
assert(base_type::_block_init);
std::lock_guard<std::recursive_mutex> lck0(base_type::ctrlMtx);
std::lock_guard<std::mutex> lck1(lvlMtx);
stereo_t lvl = level;
level = { -150.0f, -150.0f };
return lvl;
}
void reset() {
assert(base_type::_block_init);
std::lock_guard<std::recursive_mutex> lck(base_type::ctrlMtx);
level = { -150.0f, -150.0f };
}
inline int process(int count, const stereo_t* in, stereo_t* out) {
// Apply volume factor
volk_32f_s32f_multiply_32f((float*)out, (float*)in, _muted ? 0.0f : _volume, count * 2);
// Measure block level
stereo_t maxLvl = { 0, 0 };
for (int i = 0; i < count; i++) {
stereo_t lvl = { fabsf(out[i].l), fabsf(out[i].r) };
if (lvl.l > maxLvl.l) { maxLvl.l = lvl.l; }
if (lvl.r > maxLvl.r) { maxLvl.r = lvl.r; }
}
stereo_t maxLvlDB = { 20.0f * log10f(maxLvl.l), 20.0f * log10f(maxLvl.r) };
// Update max level
{
std::lock_guard<std::mutex> lck(lvlMtx);
if (maxLvlDB.l > level.l) { level.l = maxLvlDB.l; }
if (maxLvlDB.r > level.r) { level.r = maxLvlDB.r; }
}
return count;
}
@ -87,8 +53,6 @@ namespace dsp::audio {
private:
float _volume;
bool _muted;
std::mutex lvlMtx;
stereo_t level;
};
}