X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=compress.c;h=579a6ab643e479eb55156bdd3280f0d246dcee54;hb=64e8616027238f6ef1933ccef14a2e031552db79;hp=b7ddc28534106eede2ba8b7e6ad1b1d60a3b5510;hpb=1dd66e3e7c80a95dbd4fedeb7978b3f32f66d2b1;p=paraslash.git diff --git a/compress.c b/compress.c index b7ddc285..579a6ab6 100644 --- a/compress.c +++ b/compress.c @@ -1,55 +1,45 @@ /* - * 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" #include "compress_filter.cmdline.h" #include "list.h" +#include "sched.h" #include "filter.h" #include "string.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 */ +/** 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 */ - struct gengetopt_args_info *conf; - /** minimal admissible gain */ + /** 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; }; static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn) { - size_t i, length = MIN((inbuf_len / 2) * 2, (fn->bufsize - fn->loaded) / 2 * 2); + size_t i, length = PARA_MIN((inbuf_len / 2) * 2, + (fn->bufsize - fn->loaded) / 2 * 2); struct private_compress_data *pcd = fn->private_data; int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded); unsigned gain_shift = pcd->conf->inertia_arg + pcd->conf->damp_arg, @@ -61,30 +51,18 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn) /* 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 = (pcd->current_gain + - (1 << pcd->conf->inertia_arg)) / 2; - 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 = (pcd->current_gain + - (1 << pcd->conf->inertia_arg)) / 2; - pcd->peak = 0; - } else - if (-adjusted_sample > pcd->peak) - pcd->peak = -adjusted_sample; - } - *op++ = adjusted_sample; + 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; if (pcd->peak < pcd->conf->target_level_arg) { @@ -94,10 +72,9 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn) 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); + PARA_DEBUG_LOG("gain: %lu, peak: %d\n", pcd->current_gain, + pcd->peak); pcd->peak = 0; -// PARA_INFO_LOG("sample: %lu\n", ABS(sample)); } fn->loaded += length; return length; @@ -111,7 +88,7 @@ static void close_compress(struct filter_node *fn) static void *compress_parse_config(int argc, char **argv) { - struct gengetopt_args_info *ret = para_calloc(sizeof(struct gengetopt_args_info)); + 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); @@ -131,7 +108,11 @@ static void open_compress(struct filter_node *fn) pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg); } -/** the init function of the compress filter */ +/** + * The init function of the compress filter. + * + * \param f Pointer to the struct to initialize. + */ void compress_init(struct filter *f) { f->open = open_compress;