X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=33c0dfc9f7d5019484a17f97a47064fb75798358;hp=bd2b4be6869f9a09329b1bdd90936324c406f8b1;hb=081c8921f827c1ed482c45ba22bd8bb97db2838b;hpb=b3d637602e6a730a7bc91384c4ef970eeeb3d44c

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index bd2b4be6..33c0dfc9 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -14,6 +14,7 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
@@ -22,14 +23,6 @@
 #define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
 	(f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
 
-/** State of the decoding process. */
-enum mp3dec_flags {
-	/** Bad main_data_begin pointer encounterd. */
-	MP3DEC_FLAG_BAD_DATA = 1,
-	/** Some output has already been produced. */
-	MP3DEC_FLAG_DECODE_STARTED = 2,
-};
-
 /** Data specific to the mp3dec filter. */
 struct private_mp3dec_data {
 	/** Information on the current mp3 stream. */
@@ -38,33 +31,14 @@ struct private_mp3dec_data {
 	struct mad_frame frame;
 	/** Contains the PCM output. */
 	struct mad_synth synth;
-	/** See \ref mp3dec_flags. */
-	unsigned flags;
-	/** Defer decoding until this time. */
-	struct timeval stream_start_barrier;
-	/** Wait until this many input bytes are available. */
-	size_t input_len_barrier;
+	/** The number of channels of the current stream. */
+	unsigned int channels;
+	/** Current sample rate in Hz. */
+	unsigned int sample_rate;
 };
 
-static int need_bad_data_delay(struct private_mp3dec_data *pmd,
-		size_t bytes_available)
-{
-	if (!(pmd->flags & MP3DEC_FLAG_BAD_DATA))
-		return 0;
-	if (pmd->flags & MP3DEC_FLAG_DECODE_STARTED)
-		return 0;
-	if (bytes_available >= pmd->input_len_barrier)
-		return 0;
-	if (tv_diff(now, &pmd->stream_start_barrier, NULL) > 0)
-		return 0;
-	return 1;
-}
-
-/*
- * Returns negative on serious errors, zero if the error should be ignored and
- * positive on bad data pointer errors at stream start.
- */
-static int handle_decode_error(struct private_mp3dec_data *pmd, size_t len)
+/* Returns negative on serious errors. */
+static int handle_decode_error(struct private_mp3dec_data *pmd)
 {
 	if (!MAD_RECOVERABLE(pmd->stream.error)
 			&& pmd->stream.error != MAD_ERROR_BUFLEN) {
@@ -72,96 +46,126 @@ static int handle_decode_error(struct private_mp3dec_data *pmd, size_t len)
 		return -E_MAD_FRAME_DECODE;
 	}
 	PARA_DEBUG_LOG("%s\n", mad_stream_errorstr(&pmd->stream));
-	if (pmd->stream.error != MAD_ERROR_BADDATAPTR)
-		return 0;
-	if (pmd->flags & MP3DEC_FLAG_DECODE_STARTED)
-		return 0;
-	/*
-	 * Bad data pointer at stream start. Defer decoding until the amount of
-	 * data we are about to skip is available again, but wait at most 60ms.
-	 */
-	pmd->flags |= MP3DEC_FLAG_BAD_DATA;
-	pmd->input_len_barrier = len;
-	tv_add(now, &(struct timeval){0, 60 * 1000},
-		&pmd->stream_start_barrier);
-	return 1;
+	return 0;
 }
 
-static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
+static void mp3dec_consume(struct btr_node *btrn, struct mad_stream *s,
+		size_t max)
 {
+	size_t used;
+
+	if (!s->next_frame)
+		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)
+{
+	struct private_mp3dec_data *pmd = fn->private_data;
+
+	mad_synth_finish(&pmd->synth);
+	mad_frame_finish(&pmd->frame);
+	mad_stream_finish(&pmd->stream);
+
+	free(pmd);
+	fn->private_data = NULL;
+}
+
+#define MP3DEC_MAX_FRAME 8192
+
+static int mp3dec_post_select(__a_unused struct sched *s, struct task *t)
+{
+	struct filter_node *fn = container_of(t, struct filter_node, task);
 	int i, ret;
 	struct private_mp3dec_data *pmd = fn->private_data;
-	size_t copy = PARA_MIN(len, (size_t)4096);
+	struct btr_node *btrn = fn->btrn;
+	size_t loaded = 0, len, iqs;
+	char *inbuffer, *outbuffer;
 
-	if (fn->loaded + 16384 > fn->bufsize)
-		return 0;
-	if (need_bad_data_delay(pmd, len))
-		return 0;
-	mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
+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;
+	if (ret == 0)
+		return 0;
+	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
+	 * other buffer tree nodes a chance to run. This is necessary to avoid
+	 * buffer underruns on slow machines.
+	 */
+	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) {
-		if (pmd->stream.error != MAD_ERROR_BUFLEN &&
-			pmd->stream.error != MAD_ERROR_LOSTSYNC)
-			PARA_DEBUG_LOG("header decode: %s\n",
-				mad_stream_errorstr(&pmd->stream));
-		goto out;
+		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 0;
 	}
-	fn->fc->samplerate = pmd->frame.header.samplerate;
-	fn->fc->channels = MAD_NCHANNELS(&pmd->frame.header);
+	pmd->sample_rate = pmd->frame.header.samplerate;
+	pmd->channels = MAD_NCHANNELS(&pmd->frame.header);
+decode:
 	ret = mad_frame_decode(&pmd->frame, &pmd->stream);
 	if (ret != 0) {
-		ret = handle_decode_error(pmd, len);
+		ret = handle_decode_error(pmd);
 		if (ret < 0)
-			return ret;
-		if (ret == 0)
-			goto out;
-		ret = copy - (pmd->stream.bufend - pmd->stream.next_frame);
-		PARA_NOTICE_LOG("skipping %d input bytes\n", ret);
-		return ret;
+			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))
+				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;
+		mp3dec_consume(btrn, &pmd->stream, len);
+		return 0;
 	}
+	fn->min_iqs = 0;
 	mad_synth_frame(&pmd->synth, &pmd->frame);
-	pmd->flags |= MP3DEC_FLAG_DECODE_STARTED;
-
+	outbuffer = para_malloc(pmd->synth.pcm.length * 2 * pmd->channels);
+	loaded = 0;
 	for (i = 0; i < pmd->synth.pcm.length; i++) {
-		int s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
-		write_int16_host_endian(fn->buf + fn->loaded, s);
-		fn->loaded += 2;
-		if (MAD_NCHANNELS(&pmd->frame.header) == 2) { /* stereo */
-			s = MAD_TO_SHORT(pmd->synth.pcm.samples[1][i]);
-			write_int16_host_endian(fn->buf + fn->loaded, s);
-			fn->loaded += 2;
+		int sample = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
+		write_int16_host_endian(outbuffer + loaded, sample);
+		loaded += 2;
+		if (pmd->channels == 2) { /* stereo */
+			sample = MAD_TO_SHORT(pmd->synth.pcm.samples[1][i]);
+			write_int16_host_endian(outbuffer + loaded, sample);
+			loaded += 2;
 		}
-		if (fn->loaded != fn->bufsize) /* output buffer not full */
-			continue;
-		PARA_ERROR_LOG("output buffer full: %zd\n", fn->loaded);
-			return -E_MP3DEC_OVERRUN;
 	}
-	if (fn->loaded + 16384 <= fn->bufsize)
-		goto next_frame;
-out:
-	if (pmd->stream.next_frame) { /* we still have some data */
-		size_t off = pmd->stream.bufend - pmd->stream.next_frame;
-		if (fn->loaded + 16384 <= fn->bufsize && off > 2048)
-			goto next_frame;
-		return copy - off;
-	}
-	return copy;
-}
-
-static void mp3dec_close(struct filter_node *fn)
-{
-	struct private_mp3dec_data *pmd = fn->private_data;
-
-	mad_synth_finish(&pmd->synth);
-	mad_frame_finish(&pmd->frame);
-	mad_stream_finish(&pmd->stream);
-
-	free(fn->buf);
-	fn->buf = NULL;
-	free(pmd);
-	fn->private_data = NULL;
+	btr_add_output(outbuffer, loaded, btrn);
+	goto next_frame;
+err:
+	assert(ret < 0);
+	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 static void mp3dec_open(struct filter_node *fn)
@@ -173,34 +177,31 @@ static void mp3dec_open(struct filter_node *fn)
 	mad_stream_init(&pmd->stream);
 	mad_frame_init(&pmd->frame);
 	mad_synth_init(&pmd->synth);
-	fn->loaded = 0;
-	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;
+	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;
-	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;
+	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)
+{
+	struct filter_node *fn = btr_context(btrn);
+	struct private_mp3dec_data *pmd = fn->private_data;
+
+	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.
  *
@@ -212,13 +213,13 @@ 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->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
-	};
+	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);
 }