X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=bd1f0d35dbc0fe54a75c25e59beae3bc07cd5f3c;hp=3ad9025e327ee9b81c935036296223d7bf91488f;hb=23b121a85984baa9252f4b4c0b8c4f186e394bb7;hpb=08d3a77eaeb04981d225a6938404f8ac901407b4

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 3ad9025e..bd1f0d35 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <mad.h>
 #include <regex.h>
-#include <stdbool.h>
 
 #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)
@@ -82,7 +83,7 @@ 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 = 0, used, len, iqs;
+	size_t loaded = 0, len, iqs;
 	char *inbuffer, *outbuffer;
 
 next_buffer:
@@ -106,8 +107,7 @@ next_buffer:
 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;
@@ -130,7 +130,7 @@ decode:
 		ret = handle_decode_error(pmd);
 		if (ret < 0)
 			goto err;
-		ret = mad_stream_sync(&pmd->stream);
+		mad_stream_sync(&pmd->stream);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
 			ret = -E_MP3DEC_EOF;
 			if (len == iqs && btr_no_parent(btrn))
@@ -139,12 +139,12 @@ decode:
 			ret = -E_MP3DEC_CORRUPT;
 			if (fn->min_iqs > MP3DEC_MAX_FRAME)
 				goto err;
+			mp3dec_consume(btrn, &pmd->stream, len);
 			return;
 		}
 		if (pmd->stream.error != MAD_ERROR_BADDATAPTR)
 			goto decode;
-		used = used_mad_buffer_bytes(&pmd->stream, len);
-		btr_consume(btrn, used);
+		mp3dec_consume(btrn, &pmd->stream, len);
 		return;
 	}
 	fn->min_iqs = 0;
@@ -166,7 +166,7 @@ decode:
 err:
 	assert(ret < 0);
 	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
 }
 
 static void mp3dec_open(struct filter_node *fn)
@@ -184,18 +184,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)
@@ -208,7 +201,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.
@@ -221,7 +214,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;