X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3dec_filter.c;h=d4d4712f0d25a9e8981e8882ff0cbe1ddef14d0c;hb=refs%2Fheads%2Fnext;hp=bc8ccdaa99be724530372a03b71544abeece480b;hpb=15e3068cd0b95a7ae37f8edc2eceea3b2a3a49a9;p=paraslash.git

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index bc8ccdaa..d4d4712f 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -79,12 +79,11 @@ static int mp3dec_post_monitor(__a_unused struct sched *s, void *context)
 	int i, ret;
 	struct private_mp3dec_data *pmd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
-	size_t loaded = 0, len, iqs;
+	size_t loaded = 0, len;
 	char *inbuffer, *outbuffer;
 
 next_buffer:
 	pmd->stream.error = 0;
-	iqs = btr_get_input_queue_size(btrn);
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
@@ -104,8 +103,8 @@ next_frame:
 	if (ret < 0) {
 		mp3dec_consume(btrn, &pmd->stream, len);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
-			if (len == iqs && btr_no_parent(btrn)) {
-				ret = -E_MP3DEC_EOF;
+			if (fn->min_iqs > 0 && btr_no_parent(btrn)) {
+				ret = -E_EOF;
 				goto err;
 			}
 			fn->min_iqs += 100;
@@ -127,8 +126,8 @@ decode:
 			goto err;
 		mad_stream_sync(&pmd->stream);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
-			ret = -E_MP3DEC_EOF;
-			if (len == iqs && btr_no_parent(btrn))
+			ret = -E_EOF;
+			if (btr_no_parent(btrn))
 				goto err;
 			fn->min_iqs += 100;
 			ret = -E_MP3DEC_CORRUPT;
@@ -176,7 +175,8 @@ static void mp3dec_open(struct filter_node *fn)
 		mad_stream_options(&pmd->stream, MAD_OPTION_IGNORECRC);
 }
 
-static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
+static int mp3dec_execute(const struct btr_node *btrn, const char *cmd,
+		char **result)
 {
 	struct filter_node *fn = btr_context(btrn);
 	struct private_mp3dec_data *pmd = fn->private_data;