oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm/Normalizer: hard-code the preferences

Browse Source
This commit is contained in:
Max Kellermann
2023-03-13 12:08:57 +01:00
parent d2f2dde2e1
commit 6e5d9d4490
4 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/filter/plugins/NormalizeFilterPlugin.cxx
View File

@@ -18,7 +18,7 @@ class NormalizeFilter final : public Filter {
public: public:
explicit NormalizeFilter(const AudioFormat &audio_format) explicit NormalizeFilter(const AudioFormat &audio_format)
:Filter(audio_format), compressor(Compressor_new(0)) { :Filter(audio_format), compressor(Compressor_new()) {
} }
~NormalizeFilter() override { ~NormalizeFilter() override {

25
src/pcm/Normalizer.cxx
View File

@@ -4,17 +4,15 @@
#include "Normalizer.hxx" #include "Normalizer.hxx"
/*** Default configuration stuff ***/
#define TARGET 16384 /*!< Target level (on a scale of 0-32767) */
#define GAINMAX 32 /*!< The maximum amount to amplify by */
#define GAINSMOOTH 8 /*!< How much inertia ramping has*/
#define BUCKETS 400 /*!< How long of a history to use by default */
struct Compressor { struct Compressor {
int target; ///! Target level (on a scale of 0-32767)
int maxgain; static constexpr int target = 16384;
int smooth;
//! The maximum amount to amplify by
static constexpr int maxgain = 32;
//! How much inertia ramping has
static constexpr int smooth = 8;
//! History of the peak values //! History of the peak values
int *peaks; int *peaks;
@@ -34,17 +32,10 @@ Compressor_new(unsigned int history) noexcept
{ {
auto obj = new Compressor(); auto obj = new Compressor();
obj->target = TARGET;
obj->maxgain = GAINMAX;
obj->smooth = GAINSMOOTH;
obj->peaks = obj->gain = obj->clipped = nullptr; obj->peaks = obj->gain = obj->clipped = nullptr;
obj->bufsz = 0; obj->bufsz = 0;
obj->pos = 0; obj->pos = 0;
if (!history)
history = BUCKETS;
obj->bufsz = history; obj->bufsz = history;
obj->peaks = new int[history]{}; obj->peaks = new int[history]{};
obj->gain = new int[history]{}; obj->gain = new int[history]{};

2
src/pcm/Normalizer.hxx
View File

@@ -10,7 +10,7 @@ struct Compressor;
//! Create a new compressor (use history value of 0 for default) //! Create a new compressor (use history value of 0 for default)
struct Compressor * struct Compressor *
Compressor_new(unsigned int history) noexcept; Compressor_new(unsigned int history = 400) noexcept;
//! Delete a compressor //! Delete a compressor
void void

2
test/run_normalize.cxx
View File

@@ -35,7 +35,7 @@ try {
if (argc > 1) if (argc > 1)
audio_format = ParseAudioFormat(argv[1], false); audio_format = ParseAudioFormat(argv[1], false);
compressor = Compressor_new(0); compressor = Compressor_new();
while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) { while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
Compressor_Process_int16(compressor, Compressor_Process_int16(compressor,