From 7c2c68b68140c775930d3c0e2cf7f1918539a465 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 31 Mar 2013 13:08:46 +0000 Subject: [PATCH] aacdec: Switch to the alternative post select method. --- aacdec_filter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aacdec_filter.c b/aacdec_filter.c index 55f7ea25..9cea8980 100644 --- a/aacdec_filter.c +++ b/aacdec_filter.c @@ -80,7 +80,7 @@ static void aacdec_close(struct filter_node *fn) fn->private_data = NULL; } -static void aacdec_post_select(__a_unused struct sched *s, struct task *t) +static int aacdec_post_select(__a_unused struct sched *s, struct task *t) { struct filter_node *fn = container_of(t, struct filter_node, task); struct btr_node *btrn = fn->btrn; @@ -91,12 +91,11 @@ static void aacdec_post_select(__a_unused struct sched *s, struct task *t) size_t len, skip, consumed, loaded; next_buffer: - 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 **)&inbuf); len = PARA_MIN(len, (size_t)8192); @@ -203,8 +202,8 @@ out: } err: assert(ret < 0); - t->error = ret; btr_remove_node(&fn->btrn); + return ret; } /** @@ -219,6 +218,7 @@ void aacdec_filter_init(struct filter *f) f->open = aacdec_open; f->close = aacdec_close; f->pre_select = generic_filter_pre_select; - f->post_select = aacdec_post_select; + f->new_post_select = aacdec_post_select; + f->post_select = NULL; f->execute = aacdec_execute; } -- 2.39.2