X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aacdec_filter.c;h=5c1ea6d395347810ab9216707fd36aaf1b78a365;hb=3013ef1f9e2dcd1426041837daf86f3d401acd94;hp=7e6f5b21c5d87cb2131e07db8c32d91a636d19ea;hpb=794ecca1733a78908d56739db5b33c5ddcc41736;p=paraslash.git

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 7e6f5b21..5c1ea6d3 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -34,8 +34,6 @@
 struct private_aacdec_data {
 	/** the return value of aac_open */
 	NeAACDecHandle handle;
-	/** info about the currently decoded frame */
-	NeAACDecFrameInfo frame_info;
 	/** whether this instance of the aac decoder is already initialized */
 	int initialized;
 	/** number of times the decoder returned an error */
@@ -97,9 +95,9 @@ static int aacdec_post_select(__a_unused struct sched *s, void *context)
 	struct btr_node *btrn = fn->btrn;
 	struct private_aacdec_data *padd = fn->private_data;
 	int i, ret;
-	char *p, *inbuf, *outbuffer;
-	char *btr_buf;
+	char *inbuf, *outbuf, *btrbuf;
 	size_t len, consumed, loaded;
+	NeAACDecFrameInfo frame_info;
 
 next_buffer:
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
@@ -130,13 +128,12 @@ next_buffer:
 	}
 	if (consumed >= len)
 		goto success;
-	p = inbuf + consumed;
 	//PARA_CRIT_LOG("consumed: %zu (%zu + %zu), have: %zu\n", padd->consumed_total + consumed,
 	//	padd->consumed_total, consumed, len - consumed);
-	outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info,
-		(unsigned char *)p, len - consumed);
-	if (padd->frame_info.error) {
-		int err = padd->frame_info.error;
+	outbuf = NeAACDecDecode(padd->handle, &frame_info,
+		(unsigned char *)inbuf + consumed, len - consumed);
+	if (frame_info.error) {
+		int err = frame_info.error;
 		ret = -E_AAC_DECODE;
 		if (padd->error_count++ > MAX_ERRORS)
 			goto err;
@@ -145,28 +142,26 @@ next_buffer:
 		PARA_NOTICE_LOG("consumed (total, buffer, frame): "
 			"%zu, %zu, %lu\n",
 			padd->consumed_total, consumed,
-			padd->frame_info.bytesconsumed);
-		if (consumed < len)
-			consumed++; /* catch 21 */
+			frame_info.bytesconsumed);
+		consumed++; /* just eat one byte and hope for the best */
 		goto success;
 	}
 	padd->error_count = 0;
-	//PARA_CRIT_LOG("decoder ate %lu\n", padd->frame_info.bytesconsumed);
-	consumed += padd->frame_info.bytesconsumed;
-	if (!padd->frame_info.samples)
+	//PARA_CRIT_LOG("decoder ate %lu\n", frame_info.bytesconsumed);
+	consumed += frame_info.bytesconsumed;
+	if (!frame_info.samples)
 		goto success;
-	btr_buf = para_malloc(2 * padd->frame_info.samples);
+	btrbuf = para_malloc(2 * frame_info.samples);
 	loaded = 0;
-	for (i = 0; i < padd->frame_info.samples; i++) {
-		short sh = ((short *)outbuffer)[i];
-		write_int16_host_endian(btr_buf + loaded, sh);
+	for (i = 0; i < frame_info.samples; i++) {
+		short sh = ((short *)outbuf)[i];
+		write_int16_host_endian(btrbuf + loaded, sh);
 		loaded += 2;
 	}
-	btr_add_output(btr_buf, loaded, btrn);
+	btr_add_output(btrbuf, loaded, btrn);
 success:
-	ret = consumed;
-	padd->consumed_total += ret;
-	btr_consume(btrn, ret);
+	btr_consume(btrn, consumed);
+	padd->consumed_total += consumed;
 	goto next_buffer;
 err:
 	assert(ret < 0);