/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** The number of channels of the current stream. */
unsigned int channels;
/** Current sample rate in Hz. */
- unsigned int samplerate;
+ unsigned int sample_rate;
};
static int need_bad_data_delay(struct private_mp3dec_data *pmd,
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;
- struct private_mp3dec_data *pmd = fn->private_data;
- size_t copy = PARA_MIN(len, (size_t)4096);
-
- if (fn->loaded + 16384 > fn->bufsize)
- return 0;
- if (need_bad_data_delay(pmd, len))
- return 0;
- mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
- pmd->stream.error = 0;
-next_frame:
- ret = mad_header_decode(&pmd->frame.header, &pmd->stream);
- if (ret < 0) {
- if (pmd->stream.error != MAD_ERROR_BUFLEN &&
- pmd->stream.error != MAD_ERROR_LOSTSYNC)
- PARA_DEBUG_LOG("header decode: %s\n",
- mad_stream_errorstr(&pmd->stream));
- goto out;
- }
- fn->fc->samplerate = pmd->frame.header.samplerate;
- fn->fc->channels = MAD_NCHANNELS(&pmd->frame.header);
- ret = mad_frame_decode(&pmd->frame, &pmd->stream);
- if (ret != 0) {
- ret = handle_decode_error(pmd, len);
- if (ret < 0)
- return ret;
- if (ret == 0)
- goto out;
- ret = copy - (pmd->stream.bufend - pmd->stream.next_frame);
- PARA_NOTICE_LOG("skipping %d input bytes\n", ret);
- return ret;
- }
- mad_synth_frame(&pmd->synth, &pmd->frame);
- pmd->flags |= MP3DEC_FLAG_DECODE_STARTED;
-
- for (i = 0; i < pmd->synth.pcm.length; i++) {
- int s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
- write_int16_host_endian(fn->buf + fn->loaded, s);
- fn->loaded += 2;
- if (MAD_NCHANNELS(&pmd->frame.header) == 2) { /* stereo */
- s = MAD_TO_SHORT(pmd->synth.pcm.samples[1][i]);
- write_int16_host_endian(fn->buf + fn->loaded, s);
- fn->loaded += 2;
- }
- if (fn->loaded != fn->bufsize) /* output buffer not full */
- continue;
- PARA_ERROR_LOG("output buffer full: %zd\n", fn->loaded);
- return -E_MP3DEC_OVERRUN;
- }
- if (fn->loaded + 16384 <= fn->bufsize)
- goto next_frame;
-out:
- if (pmd->stream.next_frame) { /* we still have some data */
- size_t off = pmd->stream.bufend - pmd->stream.next_frame;
- if (fn->loaded + 16384 <= fn->bufsize && off > 2048)
- goto next_frame;
- return copy - off;
- }
- return copy;
-}
-
static size_t used_mad_buffer_bytes(struct mad_stream *s, size_t max)
{
size_t rv;
mad_frame_finish(&pmd->frame);
mad_stream_finish(&pmd->stream);
- free(fn->buf);
- fn->buf = NULL;
free(pmd);
fn->private_data = NULL;
}
pmd->stream.error = 0;
t->error = 0;
iqs = btr_get_input_queue_size(btrn);
- if (need_bad_data_delay(pmd, iqs))
- return;
- ret = prepare_filter_node(btrn, fn->min_iqs);
+ ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
if (ret < 0)
goto err;
+ if (need_bad_data_delay(pmd, iqs))
+ return;
if (ret == 0)
return;
+ btr_merge(btrn, fn->min_iqs);
len = btr_next_buffer(btrn, &inbuffer);
+ /*
+ * Decode at most 8K in one go to give the post_select() functions of
+ * other buffer tree nodes a chance to run. This is necessary to avoid
+ * buffer underruns on slow machines.
+ */
+ len = PARA_MIN(len, (size_t)8192);
mad_stream_buffer(&pmd->stream, (unsigned char *)inbuffer, len);
next_frame:
ret = mad_header_decode(&pmd->frame.header, &pmd->stream);
goto next_buffer;
}
fn->min_iqs = 0;
- pmd->samplerate = pmd->frame.header.samplerate;
+ pmd->sample_rate = 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)
mad_stream_init(&pmd->stream);
mad_frame_init(&pmd->frame);
mad_synth_init(&pmd->synth);
- fn->loaded = 0;
- fn->bufsize = mp3_conf->bufsize_arg * 1024;
- fn->buf = para_calloc(fn->bufsize);
if (mp3_conf->ignore_crc_given)
mad_stream_options(&pmd->stream, MAD_OPTION_IGNORECRC);
}
ret = -E_MP3DEC_SYNTAX;
if (mp3dec_cmdline_parser(argc, argv, mp3_conf))
goto err;
- ret = -ERRNO_TO_PARA_ERROR(EINVAL);
- if (mp3_conf->bufsize_arg < 32)
- goto err;
- if (mp3_conf->bufsize_arg >= INT_MAX / 1024)
- goto err;
*config = mp3_conf;
return 1;
err:
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);
+ return decoder_execute(cmd, pmd->sample_rate, pmd->channels, result);
+}
+
+static void mp3dec_free_config(void *conf)
+{
+ mp3dec_cmdline_parser_free(conf);
}
/**
* The init function of the mp3dec filter.
mp3dec_cmdline_parser_init(&dummy);
f->open = mp3dec_open;
- 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) {
projects / paraslash.git / blobdiff