X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress.c;h=d6f7520d6376dab4ccc9a4a580aab40d90f68c03;hp=936ddc3afe2cf5449d03109aac87925818a3739b;hb=89a0e510df07bc7210ca9e73381763fdd183df75;hpb=2a8029478dfc65f0c935d864faf4aea9e3deb27d diff --git a/compress.c b/compress.c index 936ddc3a..d6f7520d 100644 --- a/compress.c +++ b/compress.c @@ -1,25 +1,13 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2008 Andre Noll * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file compress.c paraslash's dynamic audio range compressor */ +/** \file compress.c Paraslash's dynamic audio range compressor. */ /* - * Used ideas of AudioCompress, (C) 2002-2004 M. Hari Nezumi + * Uses ideas of AudioCompress, (C) 2002-2004 M. Hari Nezumi */ #include "para.h" @@ -28,23 +16,24 @@ #include "sched.h" #include "filter.h" #include "string.h" +#include "error.h" -/** the size of the output data buffer */ +/** The size of the output data buffer. */ #define COMPRESS_CHUNK_SIZE 40960 -/** data specific to the compress filter */ +extern char *stat_item_values[NUM_STAT_ITEMS]; + +/** Data specific to the compress filter. */ struct private_compress_data { - /** the current multiplier */ + /** The current multiplier. */ unsigned current_gain; - /** points to the configuration data for this instance of the compress filter */ + /** Points to the configuration data for this instance of the compress filter. */ struct compress_filter_args_info *conf; - /** minimal admissible gain */ - unsigned min_gain; - /** maximal admissible gain */ + /** Maximal admissible gain. */ unsigned max_gain; - /** number of samples already seen */ + /** Number of samples already seen. */ unsigned num_samples; - /** absolute value of the maximal sample in the current block */ + /** Absolute value of the maximal sample in the current block. */ unsigned peak; }; @@ -61,45 +50,29 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn) return 0; for (i = 0; i < length / 2; i++) { /* be careful in that heat, my dear */ - int sample = *ip++, adjusted_sample; - - if (sample > 0) { - adjusted_sample = (sample * pcd->current_gain) - >> gain_shift; - if (unlikely(adjusted_sample > 32767)) { - adjusted_sample = 32767; - pcd->current_gain = (3 * pcd->current_gain + - (1 << pcd->conf->inertia_arg)) / 4; - pcd->peak = 0; - } else - if (adjusted_sample > pcd->peak) - pcd->peak = sample; - } else { - adjusted_sample = -((-sample * pcd->current_gain) - >> gain_shift); - if (unlikely(adjusted_sample < -32768)) { - adjusted_sample = -32768; - pcd->current_gain = (3 * pcd->current_gain + - (1 << pcd->conf->inertia_arg)) / 4; - pcd->peak = 0; - } else - if (-adjusted_sample > pcd->peak) - pcd->peak = -adjusted_sample; - } - *op++ = adjusted_sample; + int sample = *ip++, adjusted_sample = (PARA_ABS(sample) * + pcd->current_gain) >> gain_shift; + if (unlikely(adjusted_sample > 32767)) { /* clip */ + PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n", + sample, adjusted_sample); + adjusted_sample = 32767; + pcd->current_gain = (3 * pcd->current_gain + + (1 << pcd->conf->inertia_arg)) / 4; + pcd->peak = 0; + } else + pcd->peak = PARA_MAX(pcd->peak, adjusted_sample); + *op++ = sample >= 0? adjusted_sample : -adjusted_sample; if (likely(++pcd->num_samples & mask)) continue; +// PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain, +// pcd->peak); if (pcd->peak < pcd->conf->target_level_arg) { if (pcd->current_gain < pcd->max_gain) pcd->current_gain++; - } else { - if (pcd->current_gain > pcd->min_gain + 1) - pcd->current_gain -= 2; - } -// PARA_DEBUG_LOG("gain: %lu, peak: %d\n", pcd->current_gain, -// pcd->peak); + } else + pcd->current_gain = PARA_MAX(pcd->current_gain - 2, + 1 << pcd->conf->inertia_arg); pcd->peak = 0; -// PARA_INFO_LOG("sample: %lu\n", ABS(sample)); } fn->loaded += length; return length; @@ -111,13 +84,21 @@ static void close_compress(struct filter_node *fn) free(fn->buf); } -static void *compress_parse_config(int argc, char **argv) +/** TODO: Add sanity checks */ +static int compress_parse_config(int argc, char **argv, void **config) { - struct compress_filter_args_info *ret = para_calloc(sizeof(struct compress_filter_args_info)); - if (!compress_cmdline_parser(argc, argv, ret)) - return ret; - free(ret); - return NULL; + int ret; + struct compress_filter_args_info *compress_conf + = para_calloc(sizeof(*compress_conf)); + + ret = -E_COMPRESS_SYNTAX; + if (compress_cmdline_parser(argc, argv, compress_conf)) + goto err; + *config = compress_conf; + return 1; +err: + free(compress_conf); + return ret; } static void open_compress(struct filter_node *fn) @@ -129,12 +110,15 @@ static void open_compress(struct filter_node *fn) fn->bufsize = COMPRESS_CHUNK_SIZE; fn->buf = para_malloc(fn->bufsize); pcd->current_gain = 1 << pcd->conf->inertia_arg; - pcd->min_gain = 1 << (pcd->conf->inertia_arg - pcd->conf->aggressiveness_arg); pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg); } -/** the init function of the compress filter */ -void compress_init(struct filter *f) +/** + * The init function of the compress filter. + * + * \param f Pointer to the struct to initialize. + */ +void compress_filter_init(struct filter *f) { f->open = open_compress; f->close = close_compress;