projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Simplify display command execution.
[paraslash.git]
/
resample_filter.c
diff --git
a/resample_filter.c
b/resample_filter.c
index ed9945aecf30492b296d004d732cc23b5cc4ba86..2caa1e21395a7a77909d0284f6e44e3013640857 100644
(file)
--- a/
resample_filter.c
+++ b/
resample_filter.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2012-201
3
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012-201
4
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-202,7
+202,7
@@
static int resample_frames(int16_t *in, size_t num_frames, bool have_more,
return data.input_frames_used;
}
return data.input_frames_used;
}
-static
void
resample_post_select(__a_unused struct sched *s, struct task *t)
+static
int
resample_post_select(__a_unused struct sched *s, struct task *t)
{
int ret;
struct filter_node *fn = container_of(t, struct filter_node, task);
{
int ret;
struct filter_node *fn = container_of(t, struct filter_node, task);
@@
-231,7
+231,8
@@
static void resample_post_select(__a_unused struct sched *s, struct task *t)
* btr exec mechanism for the destination samplerate and the
* channel count.
*/
* btr exec mechanism for the destination samplerate and the
* channel count.
*/
- return btr_pushdown(btrn);
+ btr_pushdown(btrn);
+ return 0;
}
btr_merge(btrn, fn->min_iqs);
in_bytes = btr_next_buffer(btrn, (char **)&in);
}
btr_merge(btrn, fn->min_iqs);
in_bytes = btr_next_buffer(btrn, (char **)&in);
@@
-246,14
+247,14
@@
static void resample_post_select(__a_unused struct sched *s, struct task *t)
goto out;
btr_consume(btrn, ret * 2 * ctx->channels);
btr_add_output((char *)out, num_frames * 2 * ctx->channels, btrn);
goto out;
btr_consume(btrn, ret * 2 * ctx->channels);
btr_add_output((char *)out, num_frames * 2 * ctx->channels, btrn);
- return;
+ return
0
;
out:
if (ret < 0) {
out:
if (ret < 0) {
- t->error = ret;
btr_remove_node(&fn->btrn);
/* This releases the check_wav btr node */
check_wav_post_select(ctx->cwc);
}
btr_remove_node(&fn->btrn);
/* This releases the check_wav btr node */
check_wav_post_select(ctx->cwc);
}
+ return ret;
}
static int resample_parse_config(int argc, char **argv, void **config)
}
static int resample_parse_config(int argc, char **argv, void **config)
@@
-309,8
+310,5
@@
void resample_filter_init(struct filter *f)
f->parse_config = resample_parse_config;
f->free_config = resample_free_config;
f->execute = resample_execute;
f->parse_config = resample_parse_config;
f->free_config = resample_free_config;
f->execute = resample_execute;
- f->help = (struct ggo_help) {
- .short_help = resample_filter_args_info_help,
- .detailed_help = resample_filter_args_info_detailed_help
- };
+ f->help = (struct ggo_help)DEFINE_GGO_HELP(resample_filter);
}
}