X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=82f014189d3ccb8ece45652ec17fa80c9a3ee6b6;hp=b13c602bbf6a4ef03b20093254bcf80d87013399;hb=32d355e7c8bb9ed3497faf0ddd41755196d039b8;hpb=458a5757d1df752f771218b0f793841455991308

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index b13c602b..82f01418 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-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -50,7 +50,7 @@ struct private_mp3dec_data {
 	/** The number of channels of the current stream. */
 	unsigned int channels;
 	/** Current sample rate in Hz. */
-	unsigned int samplerate;
+	unsigned int sample_rate;
 };
 
 static int need_bad_data_delay(struct private_mp3dec_data *pmd,
@@ -114,8 +114,6 @@ static void mp3dec_close(struct filter_node *fn)
 	mad_frame_finish(&pmd->frame);
 	mad_stream_finish(&pmd->stream);
 
-	free(fn->buf);
-	fn->buf = NULL;
 	free(pmd);
 	fn->private_data = NULL;
 }
@@ -133,15 +131,21 @@ next_buffer:
 	pmd->stream.error = 0;
 	t->error = 0;
 	iqs = btr_get_input_queue_size(btrn);
-	if (need_bad_data_delay(pmd, iqs))
-		return;
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
+	if (need_bad_data_delay(pmd, iqs))
+		return;
 	if (ret == 0)
 		return;
 	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)8192);
 	mad_stream_buffer(&pmd->stream, (unsigned char *)inbuffer, len);
 next_frame:
 	ret = mad_header_decode(&pmd->frame.header, &pmd->stream);
@@ -161,7 +165,7 @@ next_frame:
 		goto next_buffer;
 	}
 	fn->min_iqs = 0;
-	pmd->samplerate = pmd->frame.header.samplerate;
+	pmd->sample_rate = pmd->frame.header.samplerate;
 	pmd->channels = MAD_NCHANNELS(&pmd->frame.header);
 	ret = mad_frame_decode(&pmd->frame, &pmd->stream);
 	if (ret != 0) {
@@ -207,9 +211,6 @@ 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);
 }
@@ -223,11 +224,6 @@ static int mp3dec_parse_config(int argc, char **argv, void **config)
 	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:
@@ -240,19 +236,7 @@ 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;
 
-	if (!strcmp(cmd, "samplerate")) {
-		if (pmd->samplerate == 0)
-			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
-		*result = make_message("%u", pmd->samplerate);
-		return 1;
-	}
-	if (!strcmp(cmd, "channels")) {
-		if (pmd->channels == 0)
-			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
-		*result = make_message("%u", pmd->channels);
-		return 1;
-	}
-	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+	return decoder_execute(cmd, pmd->sample_rate, pmd->channels, result);
 }
 
 static void mp3dec_free_config(void *conf)