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

ReplayGainConfig: add struct ReplayGainConfig, move globals to ReplayGainGlobal.cxx

Browse Source
This commit is contained in:
Max Kellermann 2016-11-25 11:13:08 +01:00
parent dc5984d0e0
commit 77c1f54876
11 changed files with 69 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -166,7 +166,7 @@ libmpd_a_SOURCES = \
src/queue/PlaylistState.cxx src/queue/PlaylistState.hxx \ src/queue/PlaylistState.cxx src/queue/PlaylistState.hxx \
src/queue/Listener.hxx \ src/queue/Listener.hxx \
src/PluginUnavailable.hxx \ src/PluginUnavailable.hxx \
src/ReplayGainConfig.cxx src/ReplayGainConfig.hxx \ src/ReplayGainGlobal.cxx src/ReplayGainGlobal.hxx \
src/DetachedSong.cxx src/DetachedSong.hxx \ src/DetachedSong.cxx src/DetachedSong.hxx \
src/LocateUri.cxx src/LocateUri.hxx \ src/LocateUri.cxx src/LocateUri.hxx \
src/SongUpdate.cxx \ src/SongUpdate.cxx \
@ -853,6 +853,7 @@ libbasic_a_SOURCES = \
src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \ src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \
src/AudioFormat.cxx src/AudioFormat.hxx \ src/AudioFormat.cxx src/AudioFormat.hxx \
src/AudioParser.cxx src/AudioParser.hxx \ src/AudioParser.cxx src/AudioParser.hxx \
src/ReplayGainConfig.hxx \
src/ReplayGainMode.cxx src/ReplayGainMode.hxx \ src/ReplayGainMode.cxx src/ReplayGainMode.hxx \
src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx
@ -1978,7 +1979,7 @@ test_run_filter_LDADD = \
libsystem.a \ libsystem.a \
libutil.a libutil.a
test_run_filter_SOURCES = test/run_filter.cxx \ test_run_filter_SOURCES = test/run_filter.cxx \
test/FakeReplayGainConfig.cxx \ test/FakeReplayGainGlobal.cxx \
src/Log.cxx src/LogBackend.cxx \ src/Log.cxx src/LogBackend.cxx \
src/filter/FilterPlugin.cxx src/filter/FilterRegistry.cxx src/filter/FilterPlugin.cxx src/filter/FilterRegistry.cxx
@ -2073,7 +2074,7 @@ test_run_output_LDADD = $(MPD_LIBS) \
libthread.a \ libthread.a \
libutil.a libutil.a
test_run_output_SOURCES = test/run_output.cxx \ test_run_output_SOURCES = test/run_output.cxx \
test/FakeReplayGainConfig.cxx \ test/FakeReplayGainGlobal.cxx \
test/ScopeIOThread.hxx \ test/ScopeIOThread.hxx \
src/Log.cxx src/LogBackend.cxx \ src/Log.cxx src/LogBackend.cxx \
src/IOThread.cxx \ src/IOThread.cxx \

2
src/Main.cxx
View File

@ -33,7 +33,7 @@
#include "command/AllCommands.hxx" #include "command/AllCommands.hxx"
#include "Partition.hxx" #include "Partition.hxx"
#include "tag/TagConfig.hxx" #include "tag/TagConfig.hxx"
#include "ReplayGainConfig.hxx" #include "ReplayGainGlobal.hxx"
#include "Idle.hxx" #include "Idle.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "LogInit.hxx" #include "LogInit.hxx"

15
src/ReplayGainConfig.hxx
View File

@ -21,14 +21,15 @@
#define MPD_REPLAY_GAIN_CONFIG_HXX #define MPD_REPLAY_GAIN_CONFIG_HXX
#include "check.h" #include "check.h"
#include "ReplayGainMode.hxx"
extern ReplayGainMode replay_gain_mode; struct ReplayGainConfig {
extern float replay_gain_preamp; static constexpr bool DEFAULT_LIMIT = true;
extern float replay_gain_missing_preamp;
extern bool replay_gain_limit;
void float preamp = 1.0;
replay_gain_global_init();
float missing_preamp = 1.0;
bool limit = DEFAULT_LIMIT;
};
#endif #endif

16
src/ReplayGainConfig.cxx → src/ReplayGainGlobal.cxx
View File

@ -18,6 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "ReplayGainGlobal.hxx"
#include "ReplayGainConfig.hxx" #include "ReplayGainConfig.hxx"
#include "config/Param.hxx" #include "config/Param.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
@ -28,12 +29,7 @@
#include <math.h> #include <math.h>
ReplayGainMode replay_gain_mode = ReplayGainMode::OFF; ReplayGainMode replay_gain_mode = ReplayGainMode::OFF;
ReplayGainConfig replay_gain_config;
static constexpr bool DEFAULT_REPLAYGAIN_LIMIT = true;
float replay_gain_preamp = 1.0;
float replay_gain_missing_preamp = 1.0;
bool replay_gain_limit = DEFAULT_REPLAYGAIN_LIMIT;
static float static float
ParsePreamp(const char *s) ParsePreamp(const char *s)
@ -76,12 +72,12 @@ void replay_gain_global_init(void)
param = config_get_param(ConfigOption::REPLAYGAIN_PREAMP); param = config_get_param(ConfigOption::REPLAYGAIN_PREAMP);
if (param) if (param)
replay_gain_preamp = ParsePreamp(*param); replay_gain_config.preamp = ParsePreamp(*param);
param = config_get_param(ConfigOption::REPLAYGAIN_MISSING_PREAMP); param = config_get_param(ConfigOption::REPLAYGAIN_MISSING_PREAMP);
if (param) if (param)
replay_gain_missing_preamp = ParsePreamp(*param); replay_gain_config.missing_preamp = ParsePreamp(*param);
replay_gain_limit = config_get_bool(ConfigOption::REPLAYGAIN_LIMIT, replay_gain_config.limit = config_get_bool(ConfigOption::REPLAYGAIN_LIMIT,
DEFAULT_REPLAYGAIN_LIMIT); ReplayGainConfig::DEFAULT_LIMIT);
} }

35
src/ReplayGainGlobal.hxx Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright 2003-2016 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_REPLAY_GAIN_GLOBAL_HXX
#define MPD_REPLAY_GAIN_GLOBAL_HXX
#include "check.h"
#include "ReplayGainMode.hxx"
struct ReplayGainConfig;
extern ReplayGainMode replay_gain_mode;
extern ReplayGainConfig replay_gain_config;
void
replay_gain_global_init();
#endif

10
src/ReplayGainInfo.cxx
View File

@ -19,25 +19,25 @@
#include "config.h" #include "config.h"
#include "ReplayGainInfo.hxx" #include "ReplayGainInfo.hxx"
#include "ReplayGainConfig.hxx"
#include <math.h> #include <math.h>
float float
ReplayGainTuple::CalculateScale(float preamp, float missing_preamp, ReplayGainTuple::CalculateScale(const ReplayGainConfig &config) const
bool peak_limit) const
{ {
float scale; float scale;
if (IsDefined()) { if (IsDefined()) {
scale = pow(10.0, gain / 20.0); scale = pow(10.0, gain / 20.0);
scale *= preamp; scale *= config.preamp;
if (scale > 15.0) if (scale > 15.0)
scale = 15.0; scale = 15.0;
if (peak_limit && scale * peak > 1.0) if (config.limit && scale * peak > 1.0)
scale = 1.0 / peak; scale = 1.0 / peak;
} else } else
scale = missing_preamp; scale = config.missing_preamp;
return scale; return scale;
} }

5
src/ReplayGainInfo.hxx
View File

@ -24,6 +24,8 @@
#include "Compiler.h" #include "Compiler.h"
#include "ReplayGainMode.hxx" #include "ReplayGainMode.hxx"
struct ReplayGainConfig;
struct ReplayGainTuple { struct ReplayGainTuple {
float gain; float gain;
float peak; float peak;
@ -38,8 +40,7 @@ struct ReplayGainTuple {
} }
gcc_pure gcc_pure
float CalculateScale(float preamp, float missing_preamp, float CalculateScale(const ReplayGainConfig &config) const;
bool peak_limit) const;
}; };
struct ReplayGainInfo { struct ReplayGainInfo {

2
src/command/PlayerCommands.cxx
View File

@ -30,7 +30,7 @@
#include "Instance.hxx" #include "Instance.hxx"
#include "Idle.hxx" #include "Idle.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ReplayGainConfig.hxx" #include "ReplayGainGlobal.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE

6
src/decoder/Bridge.cxx
View File

@ -30,7 +30,7 @@
#include "pcm/PcmConvert.hxx" #include "pcm/PcmConvert.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "AudioConfig.hxx" #include "AudioConfig.hxx"
#include "ReplayGainConfig.hxx" #include "ReplayGainGlobal.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
@ -599,9 +599,7 @@ DecoderBridge::SubmitReplayGain(const ReplayGainInfo *new_replay_gain_info)
const auto &tuple = new_replay_gain_info->Get(rgm); const auto &tuple = new_replay_gain_info->Get(rgm);
const auto scale = const auto scale =
tuple.CalculateScale(replay_gain_preamp, tuple.CalculateScale(replay_gain_config);
replay_gain_missing_preamp,
replay_gain_limit);
dc.replay_gain_db = 20.0 * log10f(scale); dc.replay_gain_db = 20.0 * log10f(scale);
} }

6
src/filter/plugins/ReplayGainFilterPlugin.cxx
View File

@ -24,7 +24,7 @@
#include "filter/FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ReplayGainInfo.hxx" #include "ReplayGainInfo.hxx"
#include "ReplayGainConfig.hxx" #include "ReplayGainGlobal.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/MixerControl.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
@ -140,9 +140,7 @@ ReplayGainFilter::Update()
unsigned volume = PCM_VOLUME_1; unsigned volume = PCM_VOLUME_1;
if (mode != ReplayGainMode::OFF) { if (mode != ReplayGainMode::OFF) {
const auto &tuple = info.Get(mode); const auto &tuple = info.Get(mode);
float scale = tuple.CalculateScale(replay_gain_preamp, float scale = tuple.CalculateScale(replay_gain_config);
replay_gain_missing_preamp,
replay_gain_limit);
FormatDebug(replay_gain_domain, FormatDebug(replay_gain_domain,
"scale=%f\n", (double)scale); "scale=%f\n", (double)scale);

5
test/FakeReplayGainConfig.cxx → test/FakeReplayGainGlobal.cxx
View File

@ -18,8 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "ReplayGainGlobal.hxx"
#include "ReplayGainConfig.hxx" #include "ReplayGainConfig.hxx"
float replay_gain_preamp = 1.0; ReplayGainConfig replay_gain_config;
float replay_gain_missing_preamp = 1.0;
bool replay_gain_limit = true;