#include "para.h"
#include "compress_filter.cmdline.h"
#include "list.h"
+#include "sched.h"
#include "filter.h"
#include "string.h"
/** the current multiplier */
unsigned current_gain;
/** points to the configuration data for this instance of the compress filter */
- struct gengetopt_args_info *conf;
+ struct compress_filter_args_info *conf;
/** minimal admissible gain */
unsigned min_gain;
/** maximal admissible gain */
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,
>> gain_shift;
if (unlikely(adjusted_sample > 32767)) {
adjusted_sample = 32767;
- pcd->current_gain = (pcd->current_gain +
- (1 << pcd->conf->inertia_arg)) / 2;
+ pcd->current_gain = (3 * pcd->current_gain +
+ (1 << pcd->conf->inertia_arg)) / 4;
pcd->peak = 0;
} else
if (adjusted_sample > pcd->peak)
>> gain_shift);
if (unlikely(adjusted_sample < -32768)) {
adjusted_sample = -32768;
- pcd->current_gain = (pcd->current_gain +
- (1 << pcd->conf->inertia_arg)) / 2;
+ pcd->current_gain = (3 * pcd->current_gain +
+ (1 << pcd->conf->inertia_arg)) / 4;
pcd->peak = 0;
} else
if (-adjusted_sample > pcd->peak)
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);