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, BTR_NT_INTERNAL);
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:
pmd->channels = MAD_NCHANNELS(&pmd->frame.header);
ret = mad_frame_decode(&pmd->frame, &pmd->stream);
if (ret != 0) {
- PARA_CRIT_LOG("frame decode: %d\n", ret);
+ PARA_INFO_LOG("frame decode: %s\n", mad_stream_errorstr(&pmd->stream));
used = used_mad_buffer_bytes(&pmd->stream, len);
ret = handle_decode_error(pmd, used);
btr_consume(btrn, used);
goto next_frame;
err:
assert(ret < 0);
- mp3dec_close(fn);
t->error = ret;
- btr_del_node(btrn);
+ btr_remove_node(btrn);
}
static void mp3dec_open(struct filter_node *fn)
}
return -ERRNO_TO_PARA_ERROR(ENOTSUP);
}
+
+static void mp3dec_free_config(void *conf)
+{
+ mp3dec_cmdline_parser_free(conf);
+}
/**
* The init function of the mp3dec filter.
*
f->convert = mp3dec;
f->close = mp3dec_close;
f->parse_config = mp3dec_parse_config;
- f->pre_select = mp3dec_pre_select;
+ f->free_config = mp3dec_free_config;
+ f->pre_select = generic_filter_pre_select;
f->post_select = mp3dec_post_select;
f->execute = mp3dec_execute;
f->help = (struct ggo_help) {