X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=d26fe233a85d062f839615e12f04367b582a2d85;hp=8e6b1c45eca5c65ae712875ab46250fa7a7dca7c;hb=8f69a1302a52163c61142531c4a6944510c3ec12;hpb=9277dd65aa5907f59462bc6a7e85c5bdafe15a28 diff --git a/compress_filter.c b/compress_filter.c index 8e6b1c45..d26fe233 100644 --- a/compress_filter.c +++ b/compress_filter.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 2005-2009 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file compress_filter.c Paraslash's dynamic audio range compressor. */ @@ -11,27 +7,23 @@ */ #include -#include +#include +#include "filter_cmd.lsg.h" #include "para.h" -#include "compress_filter.cmdline.h" #include "list.h" #include "sched.h" -#include "ggo.h" #include "buffer_tree.h" #include "filter.h" #include "string.h" #include "error.h" -/** The size of the output data buffer. */ -#define COMPRESS_CHUNK_SIZE 40960 +#define U32_OPTVAL(_opt, _lpr) (FILTER_CMD_OPT_UINT32_VAL(COMPRESS, _opt, _lpr)) /** Data specific to the compress filter. */ struct private_compress_data { /** The current multiplier. */ unsigned current_gain; - /** Points to the configuration data for this instance of the compress filter. */ - struct compress_filter_args_info *conf; /** Maximal admissible gain. */ unsigned max_gain; /** Number of samples already seen. */ @@ -40,15 +32,14 @@ struct private_compress_data { int peak; }; -static void close_compress(struct filter_node *fn) +static void compress_close(struct filter_node *fn) { free(fn->private_data); - free(fn->buf); } -static void compress_post_select(__a_unused struct sched *s, struct task *t) +static int compress_post_select(__a_unused struct sched *s, void *context) { - struct filter_node *fn = container_of(t, struct filter_node, task); + struct filter_node *fn = context; struct private_compress_data *pcd = fn->private_data; struct btr_node *btrn = fn->btrn; bool inplace = btr_inplace_ok(btrn); @@ -56,17 +47,16 @@ static void compress_post_select(__a_unused struct sched *s, struct task *t) char *inbuf; size_t length, i; int16_t *ip, *op; - unsigned gain_shift = pcd->conf->inertia_arg + pcd->conf->damp_arg, - mask = (1 << pcd->conf->blocksize_arg) - 1; - + uint32_t inertia = U32_OPTVAL(INERTIA, fn->lpr); + unsigned gain_shift = inertia + U32_OPTVAL(DAMP, fn->lpr), + mask = (1 << U32_OPTVAL(BLOCKSIZE, fn->lpr)) - 1; //inplace = false; next_buffer: - t->error = 0; ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); if (ret < 0) goto err; if (ret == 0) - return; + return 0; btr_merge(btrn, fn->min_iqs); length = btr_next_buffer(btrn, &inbuf) & ~(size_t)1; if (length == 0) { /* eof and 1 byte available */ @@ -80,28 +70,33 @@ next_buffer: op = para_malloc(length); for (i = 0; i < length / 2; i++) { /* be careful in that heat, my dear */ - int sample = *ip++, adjusted_sample = (PARA_ABS(sample) * - pcd->current_gain) >> gain_shift; - if (adjusted_sample > 32767) { /* clip */ - PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n", - sample, adjusted_sample); - adjusted_sample = 32767; + int sample = *ip++; + bool neg = false; + + if (sample < 0) { + sample = -sample; + neg = true; + } + sample *= pcd->current_gain; + sample >>= gain_shift; + if (sample > 32767) { /* clip */ + sample = 32767; pcd->current_gain = (3 * pcd->current_gain + - (1 << pcd->conf->inertia_arg)) / 4; + (1 << inertia)) / 4; pcd->peak = 0; - } else - pcd->peak = PARA_MAX(pcd->peak, adjusted_sample); - op[i] = sample >= 0? adjusted_sample : -adjusted_sample; + } else if (sample > pcd->peak) + pcd->peak = sample; + op[i] = neg? -sample : sample; if (++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->peak < U32_OPTVAL(TARGET_LEVEL, fn->lpr)) { if (pcd->current_gain < pcd->max_gain) pcd->current_gain++; } else pcd->current_gain = PARA_MAX(pcd->current_gain - 2, - 1U << pcd->conf->inertia_arg); + 1U << inertia); pcd->peak = 0; } if (inplace) @@ -113,63 +108,25 @@ next_buffer: goto next_buffer; err: assert(ret < 0); - t->error = ret; - btr_remove_node(btrn); + btr_remove_node(&fn->btrn); + return ret; } -/** TODO: Add sanity checks */ -static int compress_parse_config(int argc, char **argv, void **config) +static void compress_open(struct filter_node *fn) { - 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; -} + struct private_compress_data *pcd = para_calloc(sizeof(*pcd)); + uint32_t inertia = U32_OPTVAL(INERTIA, fn->lpr); + uint32_t aggressiveness = U32_OPTVAL(AGGRESSIVENESS, fn->lpr); -static void open_compress(struct filter_node *fn) -{ - struct private_compress_data *pcd = para_calloc( - sizeof(struct private_compress_data)); - pcd->conf = fn->conf; fn->private_data = pcd; fn->min_iqs = 2; /* 16 bit audio */ - fn->bufsize = COMPRESS_CHUNK_SIZE; - fn->buf = para_malloc(fn->bufsize); - pcd->current_gain = 1 << pcd->conf->inertia_arg; - pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg); + pcd->current_gain = 1U << inertia; + pcd->max_gain = 1U << (inertia + aggressiveness); } -static void compress_free_config(void *conf) -{ - compress_cmdline_parser_free(conf); -} - -/** - * The init function of the compress filter. - * - * \param f Pointer to the struct to initialize. - */ -void compress_filter_init(struct filter *f) -{ - struct compress_filter_args_info dummy; - - compress_cmdline_parser_init(&dummy); - f->open = open_compress; - f->close = close_compress; - f->pre_select = generic_filter_pre_select; - f->post_select = compress_post_select; - f->parse_config = compress_parse_config; - f->free_config = compress_free_config; - f->help = (struct ggo_help) { - .short_help = compress_filter_args_info_help, - .detailed_help = compress_filter_args_info_detailed_help - }; -} +const struct filter lsg_filter_cmd_com_compress_user_data = { + .open = compress_open, + .close = compress_close, + .pre_select = generic_filter_pre_select, + .post_select = compress_post_select, +};