mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-30 11:13:51 +00:00
Code Issues Projects Releases Wiki Activity

Create class for calculating low-pass values

Browse Source
This commit is contained in:
Erik Präntare
2022-04-08 16:40:26 +02:00
committed by Kai Blaschke
parent 0ac24d9d9f
commit 5bd329dc6a
2 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libprojectM/Renderer/BeatDetect.cpp
View File

@ -77,8 +77,7 @@ void BeatDetect::calculateBeatStatistics()
size_t const from,
size_t const to,
float& instant,
float& history,
std::array<float, BEAT_HISTORY_LENGTH>& buffer) {
LowPassFilter& history) {
instant = 0.f;
for (unsigned i = from; i < to; i++)
@ -86,22 +85,20 @@ void BeatDetect::calculateBeatStatistics()
instant += vdataL[i] + vdataR[i];
}
history -= buffer[beat_buffer_pos] / static_cast<float>(buffer.size());
history += instant / static_cast<float>(buffer.size());
buffer[beat_buffer_pos] = instant;
history.Update(instant);
};
updateFrequency(ranges[0], ranges[1], bass_instant, bass_history, bass_buffer);
updateFrequency(ranges[1], ranges[2], mid_instant, mid_history, mid_buffer);
updateFrequency(ranges[2], ranges[3], treb_instant, treb_history, treb_buffer);
updateFrequency(ranges[0], ranges[1], bass_instant, bass_history);
updateFrequency(ranges[1], ranges[2], mid_instant, mid_history);
updateFrequency(ranges[2], ranges[3], treb_instant, treb_history);
vol_instant = (bass_instant + mid_instant + treb_instant) / 3.0f;
vol_history = (bass_history + mid_history + treb_history) / 3.0f;
vol_history.Update(vol_instant);
bass = bass_instant / std::max(0.0001f, bass_history);
mid = mid_instant / std::max(0.0001f, mid_history);
treb = treb_instant / std::max(0.0001f, treb_history);
vol = vol_instant / std::max(0.0001f, vol_history);
bass = bass_instant / std::max(0.0001f, bass_history.Get());
mid = mid_instant / std::max(0.0001f, mid_history.Get());
treb = treb_instant / std::max(0.0001f, treb_history.Get());
vol = vol_instant / std::max(0.0001f, vol_history.Get());
if (std::isnan(treb))
{
@ -129,8 +126,4 @@ void BeatDetect::calculateBeatStatistics()
treb = std::min(treb, 100.f);
vol_att = std::min(vol_att, 100.f);
vol = std::min(vol, 100.f);
beat_buffer_pos++;
if (beat_buffer_pos > 79)
beat_buffer_pos = 0;
}

41
src/libprojectM/Renderer/BeatDetect.hpp
View File

@ -69,26 +69,45 @@ public:
Pcm& pcm;
private:
// this is the size of the buffer used to determine avg levels of the input audio
// the actual time represented in the history depends on FPS
static size_t constexpr BEAT_HISTORY_LENGTH{80};
class LowPassFilter
{
public:
auto
Update(float nextValue) noexcept -> void
{
m_current -= m_buffer[m_bufferPos] / bufferLength;
m_current += nextValue / bufferLength;
m_buffer[m_bufferPos] = nextValue;
++m_bufferPos;
m_bufferPos %= bufferLength;
}
[[nodiscard]] auto
Get() const noexcept -> float
{
return m_current;
}
private:
static size_t constexpr bufferLength{80};
size_t m_bufferPos{0};
std::array<float, bufferLength> m_buffer{0.f};
float m_current{0.f};
};
size_t beat_buffer_pos{0};
std::array<float, BEAT_HISTORY_LENGTH> bass_buffer{0.f};
float bass_history{0.f};
LowPassFilter bass_history;
float bass_instant{0.f};
std::array<float, BEAT_HISTORY_LENGTH> mid_buffer{0.f};
float mid_history{0.f};
LowPassFilter mid_history;
float mid_instant{0.f};
std::array<float, BEAT_HISTORY_LENGTH> treb_buffer{0.f};
float treb_history{0.f};
LowPassFilter treb_history;
float treb_instant{0.f};
std::array<float, BEAT_HISTORY_LENGTH> vol_buffer{0.f};
float vol_history{0.f};
LowPassFilter vol_history;
float vol_instant{0.f};
};