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;
fn->private_data = padd;
fn->bufsize = AAC_OUTBUF_SIZE;
fn->buf = para_calloc(fn->bufsize);
+ fn->min_iqs = 2048;
padd->handle = aac_open();
}
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;
}
err:
assert(ret < 0);
- aacdec_close(fn);
t->error = ret;
- btr_del_node(btrn);
+ btr_remove_node(btrn);
}
/**
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;
}