Skip to content

Added album normalization as recommended in AES77 #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
complexlogic merged 2 commits into from
Oct 29, 2025
Merged

Added album normalization as recommended in AES77 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d73e70c
Added album normalization as recommended in AES77
scryver Oct 27, 2025
63f3a54
Moved out the common case in handling of album calculation
scryver Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/presets/loudgain.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[Global]
TagMode=i
Album=true
AlbumAsAES77=false
TargetLoudness=-18
ClipMode=a
MaxPeakLevel=-1.0
Expand Down
25 changes: 25 additions & 0 deletions src/easymode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -68,6 +69,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -88,6 +90,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -108,6 +111,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -128,6 +132,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -148,6 +153,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -168,6 +174,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -188,6 +195,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -208,6 +216,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -228,6 +237,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -248,6 +258,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -268,6 +279,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -288,6 +300,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -308,6 +321,7 @@ static Config configs[] = {
.true_peak = false,
.clip_mode = 'p',
.do_album = true,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand Down Expand Up @@ -468,6 +482,15 @@ int global_handler([[maybe_unused]] void *user, const char *section, const char
else
quit(EXIT_FAILURE);
}
else if (MATCH(name, "AlbumAsAES77")) {
bool as_aes77;
if (convert_bool(value, as_aes77)) {
for (Config &config : configs)
config.album_as_aes77 = as_aes77;
}
else
quit(EXIT_FAILURE);
}
else if (MATCH(name, "TagMode")) {
char tag_mode;
if (parse_tag_mode_easy(value, tag_mode)) {
Expand Down Expand Up @@ -570,6 +593,8 @@ int format_handler([[maybe_unused]] void *user, const char *section, const char
// Parse setting keys
if (MATCH(name, "Album"))
convert_bool(value, configs[static_cast<int>(file_type)].do_album);
else if (MATCH(name, "AlbumAsAES77"))
convert_bool(value, configs[static_cast<int>(file_type)].album_as_aes77);
else if (MATCH(name, "TagMode"))
parse_tag_mode_easy(value, configs[static_cast<int>(file_type)].tag_mode);
else if (MATCH(name, "ClipMode"))
Expand Down
10 changes: 9 additions & 1 deletion src/rsgain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,10 @@ static void custom_mode(int argc, char *argv[])
unsigned int nb_files = 0;
opterr = 0;

const char *short_opts = "+ac:m:tdl:O::qps:LSI:o:h?";
const char *short_opts = "+aec:m:tdl:O::qps:LSI:o:h?";
static struct option long_opts[] = {
{ "album", no_argument, nullptr, 'a' },
{ "album-aes77", no_argument, nullptr, 'e' },
{ "skip-existing", no_argument, nullptr, 'S' },

{ "clip-mode", required_argument, nullptr, 'c' },
Expand Down Expand Up @@ -214,6 +215,7 @@ static void custom_mode(int argc, char *argv[])
.true_peak = false,
.clip_mode = 'n',
.do_album = false,
.album_as_aes77 = false,
.tab_output = OutputType::NONE,
.sep_header = false,
.sort_alphanum = false,
Expand All @@ -231,6 +233,11 @@ static void custom_mode(int argc, char *argv[])
config.do_album = true;
break;

case 'e':
config.do_album = true;
config.album_as_aes77 = true;
break;

case 'S':
config.skip_existing = true;
break;
Expand Down Expand Up @@ -430,6 +437,7 @@ static inline void help_custom() {
rsgain::print("\n");

CMD_HELP("--album", "-a", "Calculate album gain and peak");
CMD_HELP("--album-aes77", "-e", "Use the loudest track as the album loudness as recommended in AES77");
CMD_HELP("--skip-existing", "-S", "Don't scan files with existing ReplayGain information");
rsgain::print("\n");

Expand Down
1 change: 1 addition & 0 deletions src/rsgain.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ struct Config {
bool true_peak;
char clip_mode;
bool do_album;
bool album_as_aes77;
OutputType tab_output;
bool sep_header;
bool sort_alphanum;
Expand Down
43 changes: 29 additions & 14 deletions src/scan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,20 +672,35 @@ void ScanJob::Track::calculate_loudness(const Config &config)
void ScanJob::calculate_album_loudness()
{
double album_loudness, album_peak;
size_t nb_states = tracks.size();
std::vector<ebur128_state*> states(nb_states);
for (const Track &track : tracks)
if (track.result.track_loudness != -HUGE_VAL)
states.emplace_back(track.ebur128.get());

if (ebur128_loudness_global_multiple(states.data(), states.size(), &album_loudness) != EBUR128_SUCCESS)
album_loudness = config.target_loudness;

album_peak = std::max_element(tracks.begin(),
tracks.end(),
[](const auto &a, const auto &b) { return a.result.track_peak < b.result.track_peak; }
)->result.track_peak;

if (config.album_as_aes77) {
album_loudness = -HUGE_VAL;
album_peak = 0.0;
for (const Track &track : tracks) {
if (album_loudness < track.result.track_loudness) {
album_loudness = track.result.track_loudness;
}
if (album_peak < track.result.track_peak) {
album_peak = track.result.track_peak;
}
}
}

else {
size_t nb_states = tracks.size();
std::vector<ebur128_state*> states(nb_states);
for (const Track &track : tracks)
if (track.result.track_loudness != -HUGE_VAL)
states.emplace_back(track.ebur128.get());

if (ebur128_loudness_global_multiple(states.data(), states.size(), &album_loudness) != EBUR128_SUCCESS)
album_loudness = config.target_loudness;

album_peak = std::max_element(tracks.begin(),
tracks.end(),
[](const auto &a, const auto &b) { return a.result.track_peak < b.result.track_peak; }
)->result.track_peak;
}

double album_gain = (type == FileType::OPUS && config.opus_mode == 's' ? -23.0 : config.target_loudness)
- album_loudness;
for (Track &track : tracks) {
Expand Down
Loading