X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=ccb1553b820357e13f2cafe2c0e8a7e0502ac8fd;hp=5f6935d1a5be70c7fa89dd0368bca48e34664422;hb=refs%2Fheads%2Fnext;hpb=94802b02fadd65ac1704fe9fcbcf0a2b023d2fa4

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 5f6935d1..d4d4712f 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,19 +1,15 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file mp3dec_filter.c Paraslash's mp3 decoder. */
 
 #include <mad.h>
 #include <regex.h>
+#include <lopsub.h>
 
+#include "filter_cmd.lsg.h"
 #include "para.h"
-#include "mp3dec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -77,18 +73,17 @@ static void mp3dec_close(struct filter_node *fn)
 
 #define MP3DEC_MAX_FRAME 8192
 
-static int mp3dec_post_select(__a_unused struct sched *s, void *context)
+static int mp3dec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	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, len, iqs;
+	size_t loaded = 0, len;
 	char *inbuffer, *outbuffer;
 
 next_buffer:
 	pmd->stream.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;
@@ -97,7 +92,7 @@ next_buffer:
 	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
+	 * Decode at most 8K in one go to give the post_monitor() functions of
 	 * other buffer tree nodes a chance to run. This is necessary to avoid
 	 * buffer underruns on slow machines.
 	 */
@@ -108,8 +103,8 @@ next_frame:
 	if (ret < 0) {
 		mp3dec_consume(btrn, &pmd->stream, len);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
-			if (len == iqs && btr_no_parent(btrn)) {
-				ret = -E_MP3DEC_EOF;
+			if (fn->min_iqs > 0 && btr_no_parent(btrn)) {
+				ret = -E_EOF;
 				goto err;
 			}
 			fn->min_iqs += 100;
@@ -131,8 +126,8 @@ decode:
 			goto err;
 		mad_stream_sync(&pmd->stream);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
-			ret = -E_MP3DEC_EOF;
-			if (len == iqs && btr_no_parent(btrn))
+			ret = -E_EOF;
+			if (btr_no_parent(btrn))
 				goto err;
 			fn->min_iqs += 100;
 			ret = -E_MP3DEC_CORRUPT;
@@ -148,7 +143,7 @@ decode:
 	}
 	fn->min_iqs = 0;
 	mad_synth_frame(&pmd->synth, &pmd->frame);
-	outbuffer = para_malloc(pmd->synth.pcm.length * 2 * pmd->channels);
+	outbuffer = arr_alloc(pmd->synth.pcm.length, 2 * pmd->channels);
 	loaded = 0;
 	for (i = 0; i < pmd->synth.pcm.length; i++) {
 		int sample = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
@@ -170,27 +165,18 @@ err:
 
 static void mp3dec_open(struct filter_node *fn)
 {
-	struct private_mp3dec_data *pmd = para_calloc(sizeof(*pmd));
-	struct mp3dec_filter_args_info *mp3_conf = fn->conf;
+	struct private_mp3dec_data *pmd = zalloc(sizeof(*pmd));
 
 	fn->private_data = pmd;
 	mad_stream_init(&pmd->stream);
 	mad_frame_init(&pmd->frame);
 	mad_synth_init(&pmd->synth);
-	if (mp3_conf->ignore_crc_given)
+	if (FILTER_CMD_OPT_GIVEN(MP3DEC, IGNORE_CRC, fn->lpr))
 		mad_stream_options(&pmd->stream, MAD_OPTION_IGNORECRC);
 }
 
-static int mp3dec_parse_config(int argc, char **argv, void **config)
-{
-	struct mp3dec_filter_args_info *conf = para_calloc(sizeof(*conf));
-
-	mp3dec_filter_cmdline_parser(argc, argv, conf);
-	*config = conf;
-	return 1;
-}
-
-static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
+static int mp3dec_execute(const struct btr_node *btrn, const char *cmd,
+		char **result)
 {
 	struct filter_node *fn = btr_context(btrn);
 	struct private_mp3dec_data *pmd = fn->private_data;
@@ -198,28 +184,10 @@ static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
 	return decoder_execute(cmd, pmd->sample_rate, pmd->channels, result);
 }
 
-static void mp3dec_free_config(void *conf)
-{
-	mp3dec_filter_cmdline_parser_free(conf);
-}
-/**
- * The init function of the mp3dec filter.
- *
- * \param f Pointer to the filter struct to initialize.
- *
- * \sa filter::init.
- */
-void mp3dec_filter_init(struct filter *f)
-{
-	struct mp3dec_filter_args_info dummy;
-
-	mp3dec_filter_cmdline_parser_init(&dummy);
-	f->open = mp3dec_open;
-	f->close = mp3dec_close;
-	f->parse_config = mp3dec_parse_config;
-	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)DEFINE_GGO_HELP(mp3dec_filter);
-}
+const struct filter lsg_filter_cmd_com_mp3dec_user_data = {
+	.open = mp3dec_open,
+	.close = mp3dec_close,
+	.pre_monitor = generic_filter_pre_monitor,
+	.post_monitor = mp3dec_post_monitor,
+	.execute = mp3dec_execute,
+};