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

output_init: use the normalize filter plugin

Browse Source 
Use the plugin instead of the glue code in normalize.c.  This is used
wrapped inside a "autoconv" filter, to enable normalization for all
input file formats.
This commit is contained in:
Max Kellermann
2009-12-14 21:36:25 +01:00
parent 6a17233f78
commit 870436a592
8 changed files with 22 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/decoder_api.c
View File

@@ -25,8 +25,6 @@
#include "audio.h"
#include "song.h"
#include "buffer.h"
#include "normalize.h"
#include "pipe.h"
#include "chunk.h"
@@ -340,8 +338,6 @@ decoder_data(struct decoder *decoder,
if (replay_gain_mode != REPLAY_GAIN_OFF)
replay_gain_apply(replay_gain_info, dest, nbytes,
&dc->out_audio_format);
else if (normalizationEnabled)
normalizeData(dest, nbytes, &dc->out_audio_format);
/* expand the music pipe chunk */

3
src/main.c
View File

@@ -49,7 +49,6 @@
#include "state_file.h"
#include "tag.h"
#include "dbUtils.h"
#include "normalize.h"
#include "zeroconf.h"
#include "event_pipe.h"
#include "dirvec.h"
@@ -348,7 +347,6 @@ int main(int argc, char *argv[])
audio_output_all_init();
client_manager_init();
replay_gain_global_init();
initNormalization();
if (!input_stream_global_init(&error)) {
g_warning("%s", error->message);
@@ -426,7 +424,6 @@ int main(int argc, char *argv[])
playlist_list_global_finish();
input_stream_global_finish();
finishNormalization();
audio_output_all_finish();
volume_finish();
mapper_finish();

54
src/normalize.c
View File

@@ -1,54 +0,0 @@
/*
* Copyright (C) 2003-2009 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.
*/
#include "config.h"
#include "normalize.h"
#include "AudioCompress/compress.h"
#include "conf.h"
#include "audio_format.h"
#define DEFAULT_VOLUME_NORMALIZATION 0
int normalizationEnabled;
static struct Compressor *compressor;
void initNormalization(void)
{
normalizationEnabled = config_get_bool(CONF_VOLUME_NORMALIZATION,
DEFAULT_VOLUME_NORMALIZATION);
if (normalizationEnabled)
compressor = Compressor_new(0);
}
void finishNormalization(void)
{
if (normalizationEnabled)
Compressor_delete(compressor);
}
void normalizeData(void *buffer, int bufferSize,
const struct audio_format *format)
{
if (format->format != SAMPLE_FORMAT_S16 || format->channels != 2)
return;
Compressor_Process_int16(compressor, buffer, bufferSize / 2);
}

34
src/normalize.h
View File

@@ -1,34 +0,0 @@
/*
* Copyright (C) 2003-2009 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_NORMALIZE_H
#define MPD_NORMALIZE_H
struct audio_format;
extern int normalizationEnabled;
void initNormalization(void);
void finishNormalization(void);
void normalizeData(void *buffer, int bufferSize,
const struct audio_format *format);
#endif /* !NORMALIZE_H */

11
src/output_init.c
View File

@@ -31,6 +31,7 @@
#include "filter_registry.h"
#include "filter_config.h"
#include "filter/chain_filter_plugin.h"
#include "filter/autoconvert_filter_plugin.h"
#include <glib.h>
@@ -192,6 +193,16 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
ao->filter = filter_chain_new();
assert(ao->filter != NULL);
if (config_get_bool(CONF_VOLUME_NORMALIZATION, false)) {
struct filter *normalize_filter =
filter_new(&normalize_filter_plugin, NULL, NULL);
assert(normalize_filter != NULL);
filter_chain_append(ao->filter,
autoconvert_filter_new(normalize_filter));
}
filter_chain_parse(ao->filter,
config_get_block_string(param, AUDIO_FILTERS, ""),
&error