X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=5f6935d1a5be70c7fa89dd0368bca48e34664422;hp=6982f264a8d866970cc80e960d79628a41c74101;hb=0b6e7a20c19d642f9d8e65683e1525c91dd3de39;hpb=1c4da4194b99548b435d31bc939521fccb482630 diff --git a/mp3dec_filter.c b/mp3dec_filter.c index 6982f264..5f6935d1 100644 --- a/mp3dec_filter.c +++ b/mp3dec_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include "para.h" #include "mp3dec_filter.cmdline.h" @@ -50,16 +49,18 @@ static int handle_decode_error(struct private_mp3dec_data *pmd) return 0; } -static size_t used_mad_buffer_bytes(struct mad_stream *s, size_t max) +static void mp3dec_consume(struct btr_node *btrn, struct mad_stream *s, + size_t max) { - size_t rv; + size_t used; if (!s->next_frame) - return max; - /* we still have some data */ - rv = s->next_frame - s->buffer; - assert(rv <= max); - return rv; + used = max; + else { /* we still have some data */ + used = s->next_frame - s->buffer; + assert(used <= max); + } + btr_consume(btrn, used); } static void mp3dec_close(struct filter_node *fn) @@ -74,24 +75,25 @@ static void mp3dec_close(struct filter_node *fn) fn->private_data = NULL; } -static void mp3dec_post_select(__a_unused struct sched *s, struct task *t) +#define MP3DEC_MAX_FRAME 8192 + +static int mp3dec_post_select(__a_unused struct sched *s, void *context) { - struct filter_node *fn = container_of(t, struct filter_node, task); + struct filter_node *fn = context; int i, ret; struct private_mp3dec_data *pmd = fn->private_data; struct btr_node *btrn = fn->btrn; - size_t loaded = 0, used, len, iqs; + size_t loaded = 0, len, iqs; char *inbuffer, *outbuffer; next_buffer: pmd->stream.error = 0; - t->error = 0; iqs = btr_get_input_queue_size(btrn); ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); if (ret < 0) goto err; if (ret == 0) - return; + return 0; btr_merge(btrn, fn->min_iqs); len = btr_next_buffer(btrn, &inbuffer); /* @@ -99,25 +101,26 @@ next_buffer: * 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); + len = PARA_MIN(len, (size_t)MP3DEC_MAX_FRAME); mad_stream_buffer(&pmd->stream, (unsigned char *)inbuffer, len); next_frame: ret = mad_header_decode(&pmd->frame.header, &pmd->stream); if (ret < 0) { - used = used_mad_buffer_bytes(&pmd->stream, len); - btr_consume(btrn, used); + mp3dec_consume(btrn, &pmd->stream, len); if (pmd->stream.error == MAD_ERROR_BUFLEN) { if (len == iqs && btr_no_parent(btrn)) { ret = -E_MP3DEC_EOF; goto err; } fn->min_iqs += 100; + ret = -E_MP3DEC_CORRUPT; + if (fn->min_iqs > MP3DEC_MAX_FRAME) + goto err; } if (loaded == 0) goto next_buffer; - return; + return 0; } - fn->min_iqs = 0; pmd->sample_rate = pmd->frame.header.samplerate; pmd->channels = MAD_NCHANNELS(&pmd->frame.header); decode: @@ -127,14 +130,23 @@ decode: if (ret < 0) goto err; mad_stream_sync(&pmd->stream); - if (pmd->stream.error == MAD_ERROR_BUFLEN) - return; + if (pmd->stream.error == MAD_ERROR_BUFLEN) { + ret = -E_MP3DEC_EOF; + if (len == iqs && btr_no_parent(btrn)) + goto err; + fn->min_iqs += 100; + ret = -E_MP3DEC_CORRUPT; + if (fn->min_iqs > MP3DEC_MAX_FRAME) + goto err; + mp3dec_consume(btrn, &pmd->stream, len); + return 0; + } if (pmd->stream.error != MAD_ERROR_BADDATAPTR) goto decode; - used = used_mad_buffer_bytes(&pmd->stream, len); - btr_consume(btrn, used); - return; + mp3dec_consume(btrn, &pmd->stream, len); + return 0; } + fn->min_iqs = 0; mad_synth_frame(&pmd->synth, &pmd->frame); outbuffer = para_malloc(pmd->synth.pcm.length * 2 * pmd->channels); loaded = 0; @@ -152,8 +164,8 @@ decode: goto next_frame; err: assert(ret < 0); - t->error = ret; - btr_remove_node(btrn); + btr_remove_node(&fn->btrn); + return ret; } static void mp3dec_open(struct filter_node *fn) @@ -171,18 +183,11 @@ static void mp3dec_open(struct filter_node *fn) static int mp3dec_parse_config(int argc, char **argv, void **config) { - int ret; - struct mp3dec_filter_args_info *mp3_conf; + struct mp3dec_filter_args_info *conf = para_calloc(sizeof(*conf)); - mp3_conf = para_calloc(sizeof(*mp3_conf)); - ret = -E_MP3DEC_SYNTAX; - if (mp3dec_cmdline_parser(argc, argv, mp3_conf)) - goto err; - *config = mp3_conf; + mp3dec_filter_cmdline_parser(argc, argv, conf); + *config = conf; return 1; -err: - free(mp3_conf); - return ret; } static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result) @@ -195,7 +200,7 @@ static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result) static void mp3dec_free_config(void *conf) { - mp3dec_cmdline_parser_free(conf); + mp3dec_filter_cmdline_parser_free(conf); } /** * The init function of the mp3dec filter. @@ -208,7 +213,7 @@ void mp3dec_filter_init(struct filter *f) { struct mp3dec_filter_args_info dummy; - mp3dec_cmdline_parser_init(&dummy); + mp3dec_filter_cmdline_parser_init(&dummy); f->open = mp3dec_open; f->close = mp3dec_close; f->parse_config = mp3dec_parse_config; @@ -216,8 +221,5 @@ void mp3dec_filter_init(struct filter *f) 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 - }; + f->help = (struct ggo_help)DEFINE_GGO_HELP(mp3dec_filter); }