X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=d63236da5112d2ea9a9ac52d80c31abdc0ad78f4;hp=1ac6a99a225ea4b6c4f4faa72ce825dfd285ae72;hb=eb8ac00d795be355154f237d7e29f8ecf9999846;hpb=a365b8263a0d7a1673699bdf454677c95b38eb95

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 1ac6a99a..d63236da 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,7 +11,6 @@
 /** \file aacdec_filter.c paraslash's aac (m4a) decoder. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -81,7 +80,7 @@ static void aacdec_close(struct filter_node *fn)
 	fn->private_data = NULL;
 }
 
-static void aacdec_post_select(__a_unused struct sched *s, struct task *t)
+static int aacdec_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct btr_node *btrn = fn->btrn;
@@ -89,20 +88,18 @@ 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;
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
-		return;
+		return 0;
 	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;
@@ -125,7 +122,7 @@ next_buffer:
 			ret = -E_AACDEC_INIT;
 			if (NeAACDecInit2(padd->handle, p,
 					padd->decoder_length, &rate,
-					&channels) < 0)
+					&channels) != 0)
 				goto out;
 		}
 		padd->sample_rate = rate;
@@ -168,12 +165,15 @@ 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));
 		if (consumed < len)
 			consumed++; /* catch 21 */
 		goto success;
@@ -202,8 +202,8 @@ out:
 	}
 err:
 	assert(ret < 0);
-	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 /**