X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=95c13305519e39a86eff3cbe5cdf06b280ef8d04;hp=5166555272c672ecda4bd4109d2e29b06b90aa4d;hb=3150a0caa27a34d44556fb77f4a5aebc3d978580;hpb=7e39ff04bb18e5c050e92d5047335c4f09ac9b28

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 51665552..95c13305 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -23,10 +23,7 @@
 #include "string.h"
 #include "aac.h"
 
-/** the output buffer size */
-#define AAC_OUTBUF_SIZE (32 * 1024)
-
-/** give up decoding after that many errors */
+/** Give up decoding after that many errors. */
 #define MAX_ERRORS 20
 
 /**
@@ -55,7 +52,7 @@ struct private_aacdec_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 aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
@@ -63,19 +60,7 @@ static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 	struct filter_node *fn = btr_context(btrn);
 	struct private_aacdec_data *padd = fn->private_data;
 
-	if (!strcmp(cmd, "samplerate")) {
-		if (padd->samplerate == 0)
-			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
-		*result = make_message("%u", padd->samplerate);
-		return 1;
-	}
-	if (!strcmp(cmd, "channels")) {
-		if (padd->channels == 0)
-			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
-		*result = make_message("%u", padd->channels);
-		return 1;
-	}
-	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+	return decoder_execute(cmd, padd->sample_rate, padd->channels, result);
 }
 
 static void aacdec_open(struct filter_node *fn)
@@ -83,8 +68,6 @@ static void aacdec_open(struct filter_node *fn)
 	struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
 
 	fn->private_data = padd;
-	fn->bufsize = AAC_OUTBUF_SIZE;
-	fn->buf = para_calloc(fn->bufsize);
 	fn->min_iqs = 2048;
 	padd->handle = aac_open();
 }
@@ -94,8 +77,6 @@ static void aacdec_close(struct filter_node *fn)
 	struct private_aacdec_data *padd = fn->private_data;
 
 	NeAACDecClose(padd->handle);
-	free(fn->buf);
-	fn->buf = NULL;
 	free(padd);
 	fn->private_data = NULL;
 }
@@ -108,7 +89,7 @@ static void aacdec_post_select(__a_unused struct sched *s, struct task *t)
 	int i, ret;
 	unsigned char *p, *inbuf, *outbuffer;
 	char *btr_buf;
-	size_t len, skip, consumed, loaded, iqs;
+	size_t len, skip, consumed, loaded;
 
 next_buffer:
 	t->error = 0;
@@ -119,8 +100,8 @@ next_buffer:
 		return;
 	btr_merge(btrn, fn->min_iqs);
 	len = btr_next_buffer(btrn, (char **)&inbuf);
+	len = PARA_MIN(len, (size_t)8192);
 	consumed = 0;
-	iqs = btr_get_input_queue_size(btrn);
 	if (!padd->initialized) {
 		unsigned long rate = 0;
 		unsigned char channels = 0;
@@ -146,10 +127,10 @@ next_buffer:
 					&channels) < 0)
 				goto out;
 		}
-		padd->samplerate = rate;
+		padd->sample_rate = rate;
 		padd->channels = channels;
 		PARA_INFO_LOG("rate: %u, channels: %d\n",
-			padd->samplerate, padd->channels);
+			padd->sample_rate, padd->channels);
 		padd->initialized = 1;
 	}
 	if (padd->decoder_length > 0) {
@@ -186,13 +167,17 @@ next_buffer:
 		ret = -E_AAC_DECODE;
 		if (padd->error_count++ > MAX_ERRORS)
 			goto err;
-		PARA_ERROR_LOG("frame_error: %d (%s), consumed: %zu + %zd + %lu\n",
-			err, NeAACDecGetErrorMessage(padd->frame_info.error),
+		/* Suppress non-fatal bitstream error message at BOF/EOF */
+		if (len < fn->min_iqs || padd->consumed_total == 0) {
+			consumed = len;
+			goto success;
+		}
+		PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(err));
+		PARA_ERROR_LOG("consumed: %zu + %zd + %lu\n",
 			padd->consumed_total, consumed,
 			padd->frame_info.bytesconsumed);
-		PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(
-			padd->frame_info.error));
-		consumed++; /* catch 21 */
+		if (consumed < len)
+			consumed++; /* catch 21 */
 		goto success;
 	}
 	padd->error_count = 0;