X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec.c;h=edbe2637521f59bc1f7403bf06e110a7a85d15df;hp=ce9c50da84efcd47b2c325743f5d1feb58d9b376;hb=a87d4a87ac7418084eb78f0bcb3accff1388df3a;hpb=bfbc3f075056b468dfdb525d8a623fe50a20117a

diff --git a/aacdec.c b/aacdec.c
index ce9c50da..edbe2637 100644
--- a/aacdec.c
+++ b/aacdec.c
@@ -25,14 +25,16 @@
 #include "para.h"
 
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
 
-#define MAX_CHANNELS 6
 /** the output buffer size */
-#define AAC_OUTBUF_SIZE (FAAD_MIN_STREAMSIZE * MAX_CHANNELS)
+#define AAC_OUTBUF_SIZE (32 * 1024)
+
+#define MAX_ERRORS 20
 
 /**
  * data specific to the aacdec filter
@@ -45,22 +47,23 @@ struct private_aacdec_data {
 
 	int initialized;
 	int decoder_length;
-	long unsigned consumed_total;
-	long unsigned entry;
+	unsigned error_count;
+	size_t consumed_total;
+	size_t entry;
 };
 
 static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 {
 	struct private_aacdec_data *padd = fn->private_data;
-	struct filter_chain_info *fci = fn->fci;
-	int i, ret, skip;
+	struct filter_chain *fc = fn->fc;
+	int i, ret;
 	unsigned char *p, *outbuffer;
 	unsigned char *inbuf = (unsigned char*)input_buffer;
-	size_t consumed = 0;
+	size_t skip, consumed = 0;
 
-	if (fn->loaded > fn->bufsize * 4 / 5)
+	if (fn->loaded > fn->bufsize * 3 / 5)
 		return 0;
-	if (len < 1000 && !*fci->eof)
+	if (len < 2048 && !*fc->input_eof)
 		return 0;
 
 	if (!padd->initialized) {
@@ -86,10 +89,10 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 					&channels) < 0)
 				goto out;
 		}
-		fci->samplerate = rate;
-		fci->channels = channels;
+		fc->samplerate = rate;
+		fc->channels = channels;
 		PARA_INFO_LOG("rate: %u, channels: %d\n",
-			fci->samplerate, fci->channels);
+			fc->samplerate, fc->channels);
 		padd->initialized = 1;
 	}
 	if (padd->decoder_length > 0) {
@@ -103,7 +106,7 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 			}
 			consumed += skip;
 			padd->entry = ret;
-			PARA_INFO_LOG("entry: %lu\n", padd->entry);
+			PARA_INFO_LOG("entry: %zu\n", padd->entry);
 		}
 		ret = len;
 		if (padd->consumed_total + len < padd->entry)
@@ -111,7 +114,7 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 		if (padd->consumed_total < padd->entry)
 			consumed = padd->entry - padd->consumed_total;
 	}
-	for (; consumed < len;consumed++)
+	for (; consumed < len; consumed++)
 		if ((inbuf[consumed] & 0xfe) == 0x20)
 			break;
 	if (consumed >= len)
@@ -119,9 +122,11 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 	p = inbuf + consumed;
 	outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info, p,
 		len - consumed);
-	ret = -E_AAC_DECODE;
-	if (padd->frame_info.error != 0) {
-		PARA_ERROR_LOG("frame_error: %d, consumed: %lu + %d + %lu\n",
+	if (padd->frame_info.error) {
+		ret = -E_AAC_DECODE;
+		if (padd->error_count++ > MAX_ERRORS)
+			goto out;
+		PARA_ERROR_LOG("frame_error: %d, consumed: %zu + %zd + %lu\n",
 			padd->frame_info.error, padd->consumed_total,
 			consumed, padd->frame_info.bytesconsumed);
 		PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(
@@ -129,10 +134,14 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 		consumed++; /* catch 21 */
 		goto success;
 	}
+	padd->error_count = 0;
 	consumed += padd->frame_info.bytesconsumed;
 	ret = consumed;
 	if (!padd->frame_info.samples)
 		goto out;
+	ret = -E_AAC_OVERRUN;
+	if (padd->frame_info.samples * 2 + fn->loaded > fn->bufsize)
+		goto out;
 	for (i = 0; i < padd->frame_info.samples; i++) {
 		short *s = (short *)outbuffer;
 		fn->buf[fn->loaded++] = s[i] & 0xff;