From d5166ddbcf30d13a2af60b98e77c2322eb8cbc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kleines=20Filmr=C3=B6llchen?= Date: Sat, 23 Jul 2022 15:40:18 +0200 Subject: [PATCH] LibDSP: Actually implement the Mastering processor This can now handle mute, volume control and panning. --- Userland/Libraries/LibDSP/Effects.cpp | 26 ++++++++++++++++++++++++-- Userland/Libraries/LibDSP/Effects.h | 8 ++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Userland/Libraries/LibDSP/Effects.cpp b/Userland/Libraries/LibDSP/Effects.cpp index c7c0fe9e92..777e1725b8 100644 --- a/Userland/Libraries/LibDSP/Effects.cpp +++ b/Userland/Libraries/LibDSP/Effects.cpp @@ -59,12 +59,34 @@ void Delay::process_impl(Signal const& input_signal, Signal& output_signal) Mastering::Mastering(NonnullRefPtr transport) : EffectProcessor(move(transport)) + , m_pan("Pan", -1, 1, 0, Logarithmic::No) + , m_volume("Volume", 0, 1, 1, Logarithmic::No) + , m_muted("Mute", false) { + m_parameters.append(m_muted); + m_parameters.append(m_volume); + m_parameters.append(m_pan); } -void Mastering::process_impl([[maybe_unused]] Signal const& input_signal, [[maybe_unused]] Signal& output_signal) +void Mastering::process_impl(Signal const& input_signal, Signal& output) { - TODO(); + process_to_fixed_array(input_signal, output.get>()); +} + +void Mastering::process_to_fixed_array(Signal const& input_signal, FixedArray& output) +{ + if (m_muted) { + output.fill_with({}); + return; + } + + auto const& input = input_signal.get>(); + for (size_t i = 0; i < input.size(); ++i) { + auto sample = input[i]; + sample.log_multiply(static_cast(m_volume)); + sample.pan(static_cast(m_pan)); + output[i] = sample; + } } } diff --git a/Userland/Libraries/LibDSP/Effects.h b/Userland/Libraries/LibDSP/Effects.h index c9844cca71..bcfa6feb32 100644 --- a/Userland/Libraries/LibDSP/Effects.h +++ b/Userland/Libraries/LibDSP/Effects.h @@ -37,8 +37,16 @@ class Mastering : public EffectProcessor { public: Mastering(NonnullRefPtr); + // The mastering processor can be used by the track and therefore needs to be able to write to a fixed array directly. + // Otherwise, Track needs to do more unnecessary sample data copies. + void process_to_fixed_array(Signal const&, FixedArray&); + private: virtual void process_impl(Signal const&, Signal&) override; + + ProcessorRangeParameter m_pan; + ProcessorRangeParameter m_volume; + ProcessorBooleanParameter m_muted; }; }