From: Andre Noll <maan@systemlinux.org>
Date: Mon, 1 Dec 2008 20:16:21 +0000 (+0100)
Subject: Add command line support for mp3dec.
X-Git-Tag: v0.3.4~93
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=47a19b175dd1f39a878c948ae56a0d7054da20cc;hp=67612cc8cfd244bc1f29ff1617f849326027f8ac

Add command line support for mp3dec.

ATM, --ignore-crc and --bufsize are the only supported options.
---

diff --git a/configure.ac b/configure.ac
index c80b2610..4eb8c543 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,6 +366,8 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
 AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
 if test "$have_faad" = "yes"; then
 	AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
+	filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter.cmdline"
+	audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter.cmdline"
 	all_errlist_objs="$all_errlist_objs aac_common aacdec_filter aac_afh"
 	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
 	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
diff --git a/error.h b/error.h
index 7259a4cc..89910a47 100644
--- a/error.h
+++ b/error.h
@@ -274,6 +274,7 @@ extern const char **para_errlist[];
 #define MP3DEC_FILTER_ERRORS \
 	PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \
 	PARA_ERROR(MP3DEC_OVERRUN, "mp3 output buffer overrun"), \
+	PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \
 
 
 #define FILTER_ERRORS \
diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 50e530e1..d3265d4f 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -7,6 +7,7 @@
 /** \file mp3dec_filter.c Paraslash's mp3 decoder. */
 
 #include "para.h"
+#include "mp3dec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "filter.h"
@@ -14,9 +15,6 @@
 #include <mad.h>
 #include "string.h"
 
-/** The output buffer size. */
-#define MP3_OUTBUF_SIZE (128 * 1024)
-
 /** Convert a sample value from libmad to a signed short. */
 #define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
 	(f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
@@ -109,14 +107,38 @@ static void mp3dec_close(struct filter_node *fn)
 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;
 
 	fn->private_data = pmd;
 	mad_stream_init(&pmd->stream);
 	mad_frame_init(&pmd->frame);
 	mad_synth_init(&pmd->synth);
 	fn->loaded = 0;
-	fn->bufsize = MP3_OUTBUF_SIZE;
+	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);
+}
+
+static int mp3dec_parse_config(int argc, char **argv, void **config)
+{
+	int ret;
+	struct mp3dec_filter_args_info *mp3_conf;
+
+	mp3_conf = para_calloc(sizeof(*mp3_conf));
+	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:
+	free(mp3_conf);
+	return ret;
 }
 
 /**
@@ -131,4 +153,5 @@ void mp3dec_filter_init(struct filter *f)
 	f->open = mp3dec_open;
 	f->convert = mp3dec;
 	f->close = mp3dec_close;
+	f->parse_config = mp3dec_parse_config;
 }
diff --git a/mp3dec_filter.ggo b/mp3dec_filter.ggo
new file mode 100644
index 00000000..a34c30ae
--- /dev/null
+++ b/mp3dec_filter.ggo
@@ -0,0 +1,22 @@
+option "bufsize" b
+#~~~~~~~~~~~~~~~~~
+"size of output buffer"
+int typestr="kilobyte"
+default="128"
+optional
+details="
+	Increase this if you encounter output buffer overrun
+	errors. Smaller values make the mp3dec filter use less
+	memory. The minimal size is 32K.
+"
+
+option "ignore-crc" i
+#~~~~~~~~~~~~~~~~~~~~
+"ignore CRC information in the audio stream."
+flag off
+details="
+	This causes frames with CRC errors to be decoded and played
+	anyway. This option is not recommended, but since some encoders
+	have been known to generate bad CRC information, this option
+	is a work-around to play streams from such encoders.
+"