X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=82f014189d3ccb8ece45652ec17fa80c9a3ee6b6;hp=9eed6393c53f58b9bd8fa7e295a14553b7b4f6af;hb=eb9722e8763a9b2a2ae99d98a9715bd932081c3c;hpb=e81e1c251f7793473cd6bc220f9a3476e4cf3dc0 diff --git a/mp3dec_filter.c b/mp3dec_filter.c index 9eed6393..82f01418 100644 --- a/mp3dec_filter.c +++ b/mp3dec_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -50,7 +50,7 @@ struct private_mp3dec_data { /** 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, @@ -94,87 +94,6 @@ static int handle_decode_error(struct private_mp3dec_data *pmd, size_t len) 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; - 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; @@ -195,8 +114,6 @@ static void mp3dec_close(struct filter_node *fn) mad_frame_finish(&pmd->frame); mad_stream_finish(&pmd->stream); - free(fn->buf); - fn->buf = NULL; free(pmd); fn->private_data = NULL; } @@ -207,23 +124,28 @@ static void mp3dec_post_select(__a_unused struct sched *s, struct task *t) 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); + 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 (need_bad_data_delay(pmd, len)) + if (ret == 0) return; - if (len <= pmd->input_len_barrier && btr_no_parent(btrn)) { - ret = -E_MP3DEC_EOF; - goto err; - } -next_buffer: + btr_merge(btrn, fn->min_iqs); len = btr_next_buffer(btrn, &inbuffer); - if (len == 0) - return; + /* + * 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); @@ -231,21 +153,23 @@ next_frame: 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; - pmd->samplerate = pmd->frame.header.samplerate; + fn->min_iqs = 0; + 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); @@ -274,9 +198,8 @@ next_frame: 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) @@ -288,9 +211,6 @@ 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); } @@ -304,11 +224,6 @@ static int mp3dec_parse_config(int argc, char **argv, void **config) 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: @@ -321,19 +236,12 @@ 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); + 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. @@ -348,10 +256,10 @@ void mp3dec_filter_init(struct filter *f) 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) {