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);
- struct private_mp3dec_data *pmd = fn->private_data;
-
- t->error = 0;
- if (iqs <= pmd->input_len_barrier)
- 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;
int i, ret;
struct private_mp3dec_data *pmd = fn->private_data;
struct btr_node *btrn = fn->btrn;
- size_t loaded, used, len = btr_get_input_queue_size(btrn);
+ size_t loaded, used, len, iqs;
char *inbuffer, *outbuffer;
+next_buffer:
pmd->stream.error = 0;
t->error = 0;
- if (btr_bytes_pending(btrn) > MP3DEC_MAX_PENDING)
+ iqs = btr_get_input_queue_size(btrn);
+ if (need_bad_data_delay(pmd, iqs))
return;
- if (need_bad_data_delay(pmd, len))
- return;
- if (pmd->input_len_barrier != 0 && btr_no_parent(btrn)) {
- ret = -E_MP3DEC_EOF;
+ ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+ if (ret < 0)
goto err;
- }
-next_buffer:
- len = btr_next_buffer(btrn, &inbuffer);
- if (len == 0)
+ 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:
ret = mad_header_decode(&pmd->frame.header, &pmd->stream);
used = used_mad_buffer_bytes(&pmd->stream, len);
btr_consume(btrn, used);
if (pmd->stream.error == MAD_ERROR_BUFLEN) {
- pmd->input_len_barrier = len - used;
- ret = btr_merge(btrn);
- if (ret != 2)
- return;
+ if (len == iqs && btr_no_parent(btrn)) {
+ ret = -E_MP3DEC_EOF;
+ goto err;
+ }
+ fn->min_iqs += 100;
+ goto next_buffer;
} else if (pmd->stream.error != MAD_ERROR_LOSTSYNC)
PARA_DEBUG_LOG("header decode: %s\n",
mad_stream_errorstr(&pmd->stream));
goto next_buffer;
}
- pmd->input_len_barrier = 0;
+ fn->min_iqs = 0;
pmd->samplerate = pmd->frame.header.samplerate;
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 ret;
}
+static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
+{
+ struct filter_node *fn = btr_context(btrn);
+ struct private_mp3dec_data *pmd = fn->private_data;
+
+ if (!strcmp(cmd, "samplerate")) {
+ if (pmd->samplerate == 0)
+ return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+ *result = make_message("%u", pmd->samplerate);
+ return 1;
+ }
+ if (!strcmp(cmd, "channels")) {
+ if (pmd->channels == 0)
+ return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+ *result = make_message("%u", pmd->channels);
+ return 1;
+ }
+ 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) {
.short_help = mp3dec_filter_args_info_help,
.detailed_help = mp3dec_filter_args_info_detailed_help