/*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2014 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file amp_filter.c Paraslash's amplify filter. */
#include <regex.h>
-#include <stdbool.h>
#include "para.h"
#include "amp_filter.cmdline.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. */
struct private_amp_data {
- /** Points to the configuration data for this instance of this filter. */
- struct amp_filter_args_info *conf;
/** Amplification factor. */
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),
- (fn->bufsize - fn->loaded) / 2);
- struct private_amp_data *pad = fn->private_data;
- int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
- int factor = 64 + pad->amp;
-
- if (!length)
- return 0;
-
- if (pad->amp == 0) {
- memcpy(op, ip, length * 2);
- goto out;
- }
- for (i = 0; i < length; i++) {
- int x = (ip[i] * factor) >> 6;
-
- op[i] = x;
- if (op[i] != x)
- op[i] = (x >= 32768)? 32767 : -32768;
- }
-out:
- fn->loaded += length * 2;
- return length * 2;
-}
-
static void amp_close(struct filter_node *fn)
{
free(fn->private_data);
- free(fn->buf);
}
static int amp_parse_config(int argc, char **argv, void **config)
{
- struct amp_filter_args_info *amp_conf = para_calloc(sizeof(*amp_conf));
+ struct amp_filter_args_info *conf = para_calloc(sizeof(*conf));
int ret = -E_AMP_SYNTAX;
- if (amp_cmdline_parser(argc, argv, amp_conf))
- goto err;
+ amp_filter_cmdline_parser(argc, argv, conf);
ret = -ERRNO_TO_PARA_ERROR(EINVAL);
- if (amp_conf->amp_arg < 0)
+ if (conf->amp_arg < 0)
goto err;
- PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
- amp_conf->amp_arg, amp_conf->amp_arg / 64.0 + 1.0);
- *config = amp_conf;
+ *config = conf;
return 1;
err:
- free(amp_conf);
+ free(conf);
return ret;
}
static void amp_open(struct filter_node *fn)
{
struct private_amp_data *pad = para_calloc(sizeof(*pad));
+ struct amp_filter_args_info *conf = fn->conf;
- pad->conf = fn->conf;
fn->private_data = pad;
- if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+ fn->min_iqs = 2;
+ if (!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);
+ pad->amp = conf->amp_arg;
+ PARA_INFO_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)
+static int 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;
- char *in;
- size_t in_len = btr_next_buffer(btrn, &in);
- size_t i, length = in_len / 2;
- int16_t *ip = (int16_t *)in, *op;
+ size_t i, in_bytes, len;
+ int16_t *in, *out;
bool inplace = btr_inplace_ok(btrn);
- ret = prepare_filter_node(fn);
+ if (pad->amp == 0) { /* no amplification */
+ btr_splice_out_node(&fn->btrn);
+ return -E_AMP_ZERO_AMP;
+ }
+next_buffer:
+ 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);
+ 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)
- op = ip;
+ out = in;
else
- op = para_malloc(length * 2);
- if (pad->amp == 0) {
- memcpy(op, ip, length * 2);
- goto success;
- }
- for (i = 0; i < length; i++) {
- int x = (ip[i] * factor) >> 6;
+ out = para_malloc(len * 2);
+
+ for (i = 0; i < len; i++) {
+ int x = (in[i] * factor) >> 6;
- op[i] = x;
- if (op[i] != x)
- op[i] = (x >= 32768)? 32767 : -32768;
+ out[i] = x;
+ if (out[i] != x) /* overflow, clip */
+ out[i] = (x >= 0)? 32767 : -32768;
}
-success:
- t->error = 0;
+
if (inplace)
btr_pushdown_one(btrn);
else {
- btr_consume(btrn, length * 2);
- btr_add_output((char *)op, length * 2, btrn);
+ btr_consume(btrn, len * 2);
+ btr_add_output((char *)out, len * 2, btrn);
}
- return;
+ goto next_buffer;
err:
assert(ret < 0);
- amp_close(fn);
- t->error = ret;
- btr_del_node(btrn);
+ btr_remove_node(&fn->btrn);
+ return ret;
+}
+
+static void amp_free_config(void *conf)
+{
+ amp_filter_cmdline_parser_free(conf);
}
/**
{
struct amp_filter_args_info dummy;
- amp_cmdline_parser_init(&dummy);
+ amp_filter_cmdline_parser_init(&dummy);
f->open = amp_open;
f->close = amp_close;
- f->convert = amp_convert;
f->pre_select = generic_filter_pre_select;
f->post_select = amp_post_select;
f->parse_config = amp_parse_config;
- f->help = (struct ggo_help) {
- .short_help = amp_filter_args_info_help,
- .detailed_help = amp_filter_args_info_detailed_help
- };
+ f->free_config = amp_free_config;
+ f->help = (struct ggo_help)DEFINE_GGO_HELP(amp_filter);
}
projects / paraslash.git / blobdiff