X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=95c13305519e39a86eff3cbe5cdf06b280ef8d04;hp=1ac6a99a225ea4b6c4f4faa72ce825dfd285ae72;hb=7e37a7cf49df279b9ab467fa4f62dd376c791a26;hpb=92f089b820b45a5dbdc5b4f69d596105d5acba68

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 1ac6a99a..95c13305 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -89,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;
@@ -102,7 +102,6 @@ next_buffer:
 	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;
@@ -168,12 +167,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;