X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=90293f0a7e0e76dd2b53daf5901b4f185533861d;hp=d3265d4ff84c2b804ec9fd421f7e4694b70cf9f1;hb=e0acbd356abf4d9f1b693065b1ff23c57c53ab1e;hpb=47a19b175dd1f39a878c948ae56a0d7054da20cc

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index d3265d4f..90293f0a 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,6 +10,7 @@
 #include "mp3dec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
 #include "error.h"
 #include <mad.h>
@@ -33,9 +34,9 @@ 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, 4096);
+	size_t copy = PARA_MIN(len, (size_t)4096);
 
-	if (fn->loaded > fn->bufsize * 4 / 5)
+	if (fn->loaded + 16384 > fn->bufsize)
 		return 0;
 	mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
 	pmd->stream.error = 0;
@@ -78,7 +79,7 @@ next_frame:
 		PARA_ERROR_LOG("output buffer full: %zd\n", fn->loaded);
 			return -E_MP3DEC_OVERRUN;
 	}
-	if (fn->loaded <= fn->bufsize * 4 / 5)
+	if (fn->loaded + 16384 <= fn->bufsize)
 		goto next_frame;
 out:
 	if (pmd->stream.next_frame) { /* we still have some data */
@@ -150,8 +151,15 @@ err:
  */
 void mp3dec_filter_init(struct filter *f)
 {
+	struct mp3dec_filter_args_info dummy;
+
+	mp3dec_cmdline_parser_init(&dummy);
 	f->open = mp3dec_open;
 	f->convert = mp3dec;
 	f->close = mp3dec_close;
 	f->parse_config = mp3dec_parse_config;
+	f->help = (struct ggo_help) {
+		.short_help = mp3dec_filter_args_info_help,
+		.detailed_help = mp3dec_filter_args_info_detailed_help
+	};
 }