return 1;
}
-/** 640K ought to be enough for everybody ;) */
-#define MP3DEC_MAX_PENDING (640 * 1024)
-
-static void mp3dec_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 <= fn->min_iqs)
- return;
- if (btr_bytes_pending(fn->btrn) > MP3DEC_MAX_PENDING)
- return; /* FIXME, should use reasonable bound on timeout */
- s->timeout.tv_sec = 0;
- s->timeout.tv_usec = 1;
-}
-
static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
{
int i, ret;
iqs = btr_get_input_queue_size(btrn);
if (need_bad_data_delay(pmd, iqs))
return;
- ret = prepare_filter_node(fn);
+ ret = btr_node_status(btrn, fn->min_iqs);
if (ret < 0)
goto err;
if (ret == 0)
return;
+ btr_merge(btrn, fn->min_iqs);
len = btr_next_buffer(btrn, &inbuffer);
mad_stream_buffer(&pmd->stream, (unsigned char *)inbuffer, len);
next_frame:
f->convert = mp3dec;
f->close = mp3dec_close;
f->parse_config = mp3dec_parse_config;
- f->pre_select = mp3dec_pre_select;
+ f->pre_select = generic_filter_pre_select;
f->post_select = mp3dec_post_select;
f->execute = mp3dec_execute;
f->help = (struct ggo_help) {