prebuffer: Use new sched helper functions.

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index cb27633ca1a0cc411c5452deb82e94f886756cd4..a269240b6ab4d0262924f4b2e6feead2a74e9563 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -216,16 +216,18 @@ static void aacdec_post_select(__a_unused struct sched *s, struct task *t)
        int i, ret;
        unsigned char *p, *inbuf, *outbuffer;
        char *btr_buf;
-       size_t len, skip, consumed = 0, loaded, iqs;
+       size_t len, skip, consumed, loaded, iqs;
 
 next_buffer:
        t->error = 0;
-       ret = prepare_filter_node(fn);
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
        if (ret < 0)
                goto err;
        if (ret == 0)
                return;
+       btr_merge(btrn, fn->min_iqs);
        len = btr_next_buffer(btrn, (char **)&inbuf);
+       consumed = 0;
        iqs = btr_get_input_queue_size(btrn);
        if (!padd->initialized) {
                unsigned long rate = 0;
@@ -325,9 +327,8 @@ out:
        }
 err:
        assert(ret < 0);
-       aacdec_close(fn);
        t->error = ret;
-       btr_del_node(btrn);
+       btr_remove_node(btrn);
 }
 
 /**