X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=2c833d656c859ff2b36a9c67295681ff9a92c429;hp=392fff6547c12cb7aa6c1abd62260526171be23b;hb=11ef83c4abb2ccbdf3f99a8adf98749b2b0656c2;hpb=2b8ac364a9ad11f67bfc1cdd01c113bde30baaf7 diff --git a/amp_filter.c b/amp_filter.c index 392fff65..2c833d65 100644 --- a/amp_filter.c +++ b/amp_filter.c @@ -1,22 +1,24 @@ /* - * Copyright (C) 2008 Andre Noll + * Copyright (C) 2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file amp.c Paraslash's amplify filter. */ +/** \file amp_filter.c Paraslash's amplify filter. */ + +#include +#include #include "para.h" #include "amp_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 AMP_CHUNK_SIZE 40960 - extern char *stat_item_values[NUM_STAT_ITEMS]; /** Data specific to the amplify filter. */ @@ -27,43 +29,26 @@ struct private_amp_data { unsigned amp; }; -static ssize_t amp_convert(char *inbuf, size_t inbuf_len, struct filter_node *fn) -{ - size_t i, length = PARA_MIN((inbuf_len / 2) * 2, - (fn->bufsize - fn->loaded) / 2 * 2); - struct private_amp_data *pad = fn->private_data; - int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded); - - if (!length) - return 0; - for (i = 0; i < length / 2; i++) { - int x = (PARA_ABS(*ip) * (64 + pad->amp)) >> 6; - *op++ = *ip++ > 0? PARA_MIN(x, 32767) : PARA_MAX(-x, -32768); - } - fn->loaded += length; - return length; -} - static void amp_close(struct filter_node *fn) { free(fn->private_data); - free(fn->buf); } -static void *amp_parse_config(int argc, char **argv) +static int amp_parse_config(int argc, char **argv, void **config) { - struct amp_filter_args_info *conf = para_calloc(sizeof(*conf)); + struct amp_filter_args_info *amp_conf = para_calloc(sizeof(*amp_conf)); + int ret = -E_AMP_SYNTAX; - if (amp_cmdline_parser(argc, argv, conf)) + if (amp_cmdline_parser(argc, argv, amp_conf)) goto err; - if (conf->amp_arg < 0) + ret = -ERRNO_TO_PARA_ERROR(EINVAL); + if (amp_conf->amp_arg < 0) goto err; - PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n", conf->amp_arg, - conf->amp_arg / 64.0 + 1.0); - return conf; + *config = amp_conf; + return 1; err: - free(conf); - return NULL; + free(amp_conf); + return ret; } static void amp_open(struct filter_node *fn) @@ -72,14 +57,74 @@ static void amp_open(struct filter_node *fn) pad->conf = fn->conf; fn->private_data = pad; - if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION]) { - int i = SI_AMPLIFICATION; - char *s = stat_item_values[i] + strlen(status_item_list[i]) + 1; - sscanf(s, "%u", &pad->amp); - } else + fn->min_iqs = 2; + if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION]) + sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp); + else pad->amp = pad->conf->amp_arg; - fn->bufsize = AMP_CHUNK_SIZE; - fn->buf = para_malloc(fn->bufsize); + PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n", + pad->amp, pad->amp / 64.0 + 1.0); +} + +static void amp_post_select(__a_unused struct sched *s, struct task *t) +{ + struct filter_node *fn = container_of(t, struct filter_node, task); + struct private_amp_data *pad = fn->private_data; + struct btr_node *btrn = fn->btrn; + int ret, factor = 64 + pad->amp; + size_t i, in_bytes, len; + int16_t *in, *out; + bool inplace = btr_inplace_ok(btrn); + + if (pad->amp == 0) { /* no amplification */ + t->error = -E_AMP_ZERO_AMP; + btr_splice_out_node(btrn); + return; + } +next_buffer: + ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); + if (ret < 0) + goto err; + if (ret == 0) + return; + btr_merge(btrn, fn->min_iqs); + in_bytes = btr_next_buffer(btrn, (char **)&in); + len = in_bytes / 2; + if (len == 0) { /* eof and in_bytes == 1 */ + ret = -E_AMP_EOF; + goto err; + } + + if (inplace) + out = in; + else + out = para_malloc(len * 2); + + for (i = 0; i < len; i++) { + int x = (in[i] * factor) >> 6; + + out[i] = x; + if (out[i] != x) /* overflow, clip */ + out[i] = (x >= 0)? 32767 : -32768; + } + + if (inplace) + btr_pushdown_one(btrn); + else { + btr_consume(btrn, len * 2); + btr_add_output((char *)out, len * 2, btrn); + } + t->error = 0; + goto next_buffer; +err: + assert(ret < 0); + t->error = ret; + btr_remove_node(btrn); +} + +static void amp_free_config(void *conf) +{ + amp_cmdline_parser_free(conf); } /** @@ -87,11 +132,19 @@ static void amp_open(struct filter_node *fn) * * \param f Pointer to the struct to initialize. */ -void amp_init(struct filter *f) +void amp_filter_init(struct filter *f) { + struct amp_filter_args_info dummy; + + amp_cmdline_parser_init(&dummy); f->open = amp_open; f->close = amp_close; - f->convert = amp_convert; - f->print_help = amp_cmdline_parser_print_help; + f->pre_select = generic_filter_pre_select; + f->post_select = amp_post_select; f->parse_config = amp_parse_config; + f->free_config = amp_free_config; + f->help = (struct ggo_help) { + .short_help = amp_filter_args_info_help, + .detailed_help = amp_filter_args_info_detailed_help + }; }