X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=mp3dec_filter.c;h=dfec0c4c133591c81c8be1cece951a0ea2a8b48f;hb=81f6ec36f467795d7f17fcc669395f8a5d1223bb;hp=d95758e4238ef77989e969cc5ff210d0d6dd5504;hpb=32600902da1667801fd8c118ed5053b86cae07cb;p=paraslash.git

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index d95758e4..dfec0c4c 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -207,23 +207,21 @@ static void mp3dec_post_select(__a_unused struct sched *s, struct task *t)
 	int i, ret;
 	struct private_mp3dec_data *pmd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
-	size_t loaded, used, len = btr_get_input_queue_size(btrn);
+	size_t loaded, used, len, iqs;
 	char *inbuffer, *outbuffer;
 
+next_buffer:
 	pmd->stream.error = 0;
 	t->error = 0;
-	if (btr_bytes_pending(btrn) > MP3DEC_MAX_PENDING)
-		return;
-	if (need_bad_data_delay(pmd, len))
+	iqs = btr_get_input_queue_size(btrn);
+	if (need_bad_data_delay(pmd, iqs))
 		return;
-	if (pmd->input_len_barrier != 0 && btr_no_parent(btrn)) {
-		ret = -E_MP3DEC_EOF;
+	ret = prepare_filter_node(btrn, pmd->input_len_barrier);
+	if (ret < 0)
 		goto err;
-	}
-next_buffer:
-	len = btr_next_buffer(btrn, &inbuffer);
-	if (len == 0)
+	if (ret == 0)
 		return;
+	len = btr_next_buffer(btrn, &inbuffer);
 	mad_stream_buffer(&pmd->stream, (unsigned char *)inbuffer, len);
 next_frame:
 	ret = mad_header_decode(&pmd->frame.header, &pmd->stream);
@@ -231,10 +229,12 @@ next_frame:
 		used = used_mad_buffer_bytes(&pmd->stream, len);
 		btr_consume(btrn, used);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
-			pmd->input_len_barrier = len - used;
-			ret = btr_merge(btrn);
-			if (ret != 2)
-				return;
+			if (len == iqs && btr_no_parent(btrn)) {
+				ret = -E_MP3DEC_EOF;
+				goto err;
+			}
+			pmd->input_len_barrier += 100;
+			goto next_buffer;
 		} else if (pmd->stream.error != MAD_ERROR_LOSTSYNC)
 			PARA_DEBUG_LOG("header decode: %s\n",
 				mad_stream_errorstr(&pmd->stream));