aacdec: Reset "consumed" at each iteration.

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 0b520da4fa134757d00fd23fd709083a95a44b22..a269240b6ab4d0262924f4b2e6feead2a74e9563 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -58,22 +58,6 @@ struct private_aacdec_data {
        unsigned int samplerate;
 };
 
-#define AACDEC_MAX_PENDING (640 * 1024)
-
-static void aacdec_pre_select(struct sched *s, struct task *t)
-{
-       struct filter_node *fn = container_of(t, struct filter_node, task);
-       size_t iqs = btr_get_input_queue_size(fn->btrn);
-
-       t->error = 0;
-       if (iqs == 0)
-               return;
-       if (btr_bytes_pending(fn->btrn) > AACDEC_MAX_PENDING)
-               return; /* FIXME, should use reasonable bound on timeout */
-       s->timeout.tv_sec = 0;
-       s->timeout.tv_usec = 1;
-}
-
 static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 {
        struct private_aacdec_data *padd = fn->private_data;
@@ -209,6 +193,7 @@ static void aacdec_open(struct filter_node *fn)
        fn->private_data = padd;
        fn->bufsize = AAC_OUTBUF_SIZE;
        fn->buf = para_calloc(fn->bufsize);
+       fn->min_iqs = 2048;
        padd->handle = aac_open();
 }
 
@@ -231,33 +216,19 @@ 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;
-       iqs = btr_get_input_queue_size(btrn);
-       if (iqs < 2048) {
-               if (!btr_no_parent(btrn)) /* wait for more data */
-                       return;
-       }
-       if (btr_bytes_pending(btrn) > AACDEC_MAX_PENDING)
-               return;
-       /* avoid "buffer too small" errors from the decoder */
-       for (;;) {
-               len = btr_next_buffer(btrn, (char **)&inbuf);
-               if (len >= 2048)
-                       break;
-               if (btr_merge(btrn) < 2) /* only one buffer left */
-                       break;
-       }
-       //PARA_CRIT_LOG("next buffer: %zu\n", len);
-       if (len == 0) {
-               if (btr_no_parent(btrn)) {
-                       ret = -E_AACDEC_EOF;
-                       goto err;
-               }
+       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;
                unsigned char channels = 0;
@@ -356,9 +327,8 @@ out:
        }
 err:
        assert(ret < 0);
-       aacdec_close(fn);
        t->error = ret;
-       btr_del_node(btrn);
+       btr_remove_node(btrn);
 }
 
 /**
@@ -373,8 +343,7 @@ void aacdec_filter_init(struct filter *f)
        f->open = aacdec_open;
        f->convert = aacdec;
        f->close = aacdec_close;
-       f->pre_select = aacdec_pre_select;
-       f->post_select = aacdec_post_select;
+       f->pre_select = generic_filter_pre_select;
        f->post_select = aacdec_post_select;
        f->execute = aacdec_execute;
 }