From 60b8537cf1caf45e3f3d11cc73e7b381008cd697 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 31 Mar 2013 13:43:34 +0000 Subject: [PATCH] wmadec: Switch to the alternative post select method. --- wmadec_filter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wmadec_filter.c b/wmadec_filter.c index ce8d7e87..1beeb5ac 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -1210,7 +1210,7 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result) #define WMA_OUTPUT_BUFFER_SIZE (128 * 1024) -static void wmadec_post_select(__a_unused struct sched *s, struct task *t) +static int wmadec_post_select(__a_unused struct sched *s, struct task *t) { struct filter_node *fn = container_of(t, struct filter_node, task); int ret, converted, out_size; @@ -1221,12 +1221,11 @@ static void wmadec_post_select(__a_unused struct sched *s, struct task *t) next_buffer: converted = 0; - t->error = 0; 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); len = btr_next_buffer(btrn, (char **)&in); ret = -E_WMADEC_EOF; @@ -1262,11 +1261,11 @@ next_buffer: converted += ret + WMA_FRAME_SKIP; success: btr_consume(btrn, converted); - return; + return 0; err: assert(ret < 0); - t->error = ret; btr_remove_node(&fn->btrn); + return ret; } static void wmadec_open(struct filter_node *fn) @@ -1286,5 +1285,6 @@ void wmadec_filter_init(struct filter *f) f->close = wmadec_close; f->execute = wmadec_execute; f->pre_select = generic_filter_pre_select; - f->post_select = wmadec_post_select; + f->new_post_select = wmadec_post_select; + f->post_select = NULL; } -- 2.39.2