mirror of
https://github.com/RGBCube/serenity
synced 2025-05-28 18:45:10 +00:00
SoundPlayer+LibDSP: Move the FFT implementation to LibDSP
LibDSP can greatly benefit from this nice FFT implementation, so let's move it into the fitting library :^) Note that this now requires linking SoundPlayer against LibDSP. That's not an issue (LibDSP is rather small currently anyways), as we can probably make great use of it in the future anyways.
This commit is contained in:
parent
4cbf7f24be
commit
a099a77e82
5 changed files with 14 additions and 6 deletions
|
@ -5,8 +5,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "BarsVisualizationWidget.h"
|
#include "BarsVisualizationWidget.h"
|
||||||
#include "AudioAlgorithms.h"
|
|
||||||
#include <AK/Math.h>
|
#include <AK/Math.h>
|
||||||
|
#include <LibDSP/FFT.h>
|
||||||
#include <LibGUI/Event.h>
|
#include <LibGUI/Event.h>
|
||||||
#include <LibGUI/Menu.h>
|
#include <LibGUI/Menu.h>
|
||||||
#include <LibGUI/Painter.h>
|
#include <LibGUI/Painter.h>
|
||||||
|
@ -25,7 +25,7 @@ void BarsVisualizationWidget::paint_event(GUI::PaintEvent& event)
|
||||||
if (m_sample_buffer.is_empty())
|
if (m_sample_buffer.is_empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
fft(m_sample_buffer, false);
|
LibDSP::fft(m_sample_buffer, false);
|
||||||
double max = AK::sqrt(m_sample_count * 2.);
|
double max = AK::sqrt(m_sample_count * 2.);
|
||||||
|
|
||||||
double freq_bin = m_samplerate / (double)m_sample_count;
|
double freq_bin = m_samplerate / (double)m_sample_count;
|
||||||
|
|
|
@ -13,11 +13,10 @@ set(SOURCES
|
||||||
SampleWidget.cpp
|
SampleWidget.cpp
|
||||||
SoundPlayerWidgetAdvancedView.cpp
|
SoundPlayerWidgetAdvancedView.cpp
|
||||||
BarsVisualizationWidget.cpp
|
BarsVisualizationWidget.cpp
|
||||||
AudioAlgorithms.cpp
|
|
||||||
NoVisualizationWidget.cpp
|
NoVisualizationWidget.cpp
|
||||||
M3UParser.cpp
|
M3UParser.cpp
|
||||||
PlaylistWidget.cpp
|
PlaylistWidget.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_app(SoundPlayer ICON app-sound-player)
|
serenity_app(SoundPlayer ICON app-sound-player)
|
||||||
target_link_libraries(SoundPlayer LibAudio LibGUI)
|
target_link_libraries(SoundPlayer LibAudio LibDSP LibGUI)
|
||||||
|
|
|
@ -3,6 +3,7 @@ set(SOURCES
|
||||||
Track.cpp
|
Track.cpp
|
||||||
Effects.cpp
|
Effects.cpp
|
||||||
Synthesizers.cpp
|
Synthesizers.cpp
|
||||||
|
FFT.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_lib(LibDSP dsp)
|
serenity_lib(LibDSP dsp)
|
||||||
|
|
|
@ -4,10 +4,12 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "AudioAlgorithms.h"
|
#include "FFT.h"
|
||||||
#include <AK/Complex.h>
|
#include <AK/Complex.h>
|
||||||
#include <AK/Math.h>
|
#include <AK/Math.h>
|
||||||
|
|
||||||
|
namespace LibDSP {
|
||||||
|
|
||||||
// This function uses the input vector as output too. therefore, if you wish to
|
// This function uses the input vector as output too. therefore, if you wish to
|
||||||
// leave it intact, pass a copy to this function
|
// leave it intact, pass a copy to this function
|
||||||
//
|
//
|
||||||
|
@ -56,3 +58,5 @@ void fft(Vector<Complex<double>>& sample_data, bool invert)
|
||||||
data[i] /= n;
|
data[i] /= n;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -9,4 +9,8 @@
|
||||||
#include <AK/Complex.h>
|
#include <AK/Complex.h>
|
||||||
#include <AK/Vector.h>
|
#include <AK/Vector.h>
|
||||||
|
|
||||||
void fft(Vector<Complex<double>>& sample_data, bool invert);
|
namespace LibDSP {
|
||||||
|
|
||||||
|
void fft(Vector<Complex<double>>& sample_data, bool invert = false);
|
||||||
|
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue