free(fn->private_data);
}
-static int compress_post_select(__a_unused struct sched *s, void *context)
+static int compress_post_monitor(__a_unused struct sched *s, void *context)
{
struct filter_node *fn = context;
struct private_compress_data *pcd = fn->private_data;
btr_merge(btrn, fn->min_iqs);
length = btr_next_buffer(btrn, &inbuf) & ~(size_t)1;
if (length == 0) { /* eof and 1 byte available */
- ret = -E_COMPRESS_EOF;
+ ret = -E_EOF;
goto err;
}
ip = (int16_t *)inbuf;
if (inplace)
op = ip;
else
- op = para_malloc(length);
+ op = alloc(length);
for (i = 0; i < length / 2; i++) {
/* be careful in that heat, my dear */
int sample = *ip++;
sample *= pcd->current_gain;
sample >>= inertia + 1;
if (sample > 32767) { /* clip */
- PARA_WARNING_LOG("clip: %d\n", sample);
+ PARA_NOTICE_LOG("clip: %d\n", sample);
sample = 32767;
pcd->current_gain = (3 * pcd->current_gain +
(1 << inertia)) / 4;
static void compress_open(struct filter_node *fn)
{
- struct private_compress_data *pcd = para_calloc(sizeof(*pcd));
+ struct private_compress_data *pcd = zalloc(sizeof(*pcd));
uint32_t inertia = U32_OPTVAL(INERTIA, fn->lpr);
uint32_t aggressiveness = U32_OPTVAL(AGGRESSIVENESS, fn->lpr);
fn->private_data = pcd;
fn->min_iqs = 2; /* 16 bit audio */
pcd->current_gain = 1U << inertia;
- pcd->max_gain = 1U << (inertia + aggressiveness);
+ pcd->max_gain = (1U << inertia) * (1.0 + 3.0 * aggressiveness / 10.0);
}
static void *compress_setup(const struct lls_parse_result *lpr)
exit(EXIT_FAILURE);
}
val = U32_OPTVAL(AGGRESSIVENESS, lpr);
- if (val == 0 || val > 15) {
+ if (val > 10) {
PARA_EMERG_LOG("aggressiveness (%u) out of range\n", val);
exit(EXIT_FAILURE);
}
val = U32_OPTVAL(INERTIA, lpr);
- if (val == 0 || val > 15) {
+ if (val == 0 || val > 14) {
PARA_EMERG_LOG("inertia (%u) out of range\n", val);
exit(EXIT_FAILURE);
}
- val = U32_OPTVAL(AGGRESSIVENESS, lpr) + U32_OPTVAL(INERTIA, lpr);
- if (val > 16) {
- PARA_EMERG_LOG("inertia + aggressiveness (%u) > 16\n", val);
- exit(EXIT_FAILURE);
- }
val = U32_OPTVAL(TARGET_LEVEL, lpr);
if (val > 32767) {
PARA_EMERG_LOG("target-level (%u) out of range\n", val);
.setup = compress_setup,
.open = compress_open,
.close = compress_close,
- .pre_select = generic_filter_pre_select,
- .post_select = compress_post_select,
+ .pre_monitor = generic_filter_pre_monitor,
+ .post_monitor = compress_post_monitor,
};