From 24bbc541c5d8ebe6fd5fa5798560fa833f9e1b79 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 31 Mar 2013 13:34:37 +0000 Subject: [PATCH] resample: Switch to the alternative post select method. --- resample_filter.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/resample_filter.c b/resample_filter.c index ed9945ae..383332b2 100644 --- a/resample_filter.c +++ b/resample_filter.c @@ -202,7 +202,7 @@ static int resample_frames(int16_t *in, size_t num_frames, bool have_more, 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); @@ -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. */ - return btr_pushdown(btrn); + btr_pushdown(btrn); + return 0; } 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); - return; + return 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); } + return ret; } static int resample_parse_config(int argc, char **argv, void **config) @@ -305,7 +306,8 @@ void resample_filter_init(struct filter *f) f->close = resample_close; f->open = resample_open; f->pre_select = resample_pre_select; - f->post_select = resample_post_select; + f->new_post_select = resample_post_select; + f->post_select = NULL; f->parse_config = resample_parse_config; f->free_config = resample_free_config; f->execute = resample_execute; -- 2.39.5