From: Andre Noll <maan@systemlinux.org>
Date: Sat, 7 Apr 2012 01:02:02 +0000 (+0200)
Subject: flacdec: Only process a single flac audio frame.
X-Git-Tag: v0.4.11~13^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d6e0177297fc95e508be8c40cdecd3be7397cc03

flacdec: Only process a single flac audio frame.

This removes the loop in flacdec_post_select() which makes the
flac decoder decode as much as possible, but may starve other
tasks. Removing the loop gives other tasks a chance to run, thereby
avoiding buffer underruns. It simplifies the code too.

Also, resetting the number of unconsumed input bytes to zero at
each scheduler iteration has always been a mistake, so remove it.
---

diff --git a/flacdec_filter.c b/flacdec_filter.c
index cd086f45..e8baa6b4 100644
--- a/flacdec_filter.c
+++ b/flacdec_filter.c
@@ -234,27 +234,25 @@ static void flacdec_post_select(__a_unused struct sched *s, struct task *t)
 		ret = flacdec_init(fn);
 		goto out;
 	}
-	pfd->unconsumed = 0;
-	for (;;) {
-		if (output_queue_full(btrn)) {
-			pfd->have_more = true;
-			break;
-		}
-		pfd->have_more = false;
-		FLAC__StreamDecoderState state;
-		FLAC__stream_decoder_process_single(pfd->decoder);
-		state = FLAC__stream_decoder_get_state(pfd->decoder);
-		//PARA_CRIT_LOG("state: %s\n", FLAC__stream_decoder_get_resolved_state_string(pfd->decoder));
-		ret = -E_FLACDEC_EOF;
-		if (state == FLAC__STREAM_DECODER_END_OF_STREAM)
-			goto out;
-		if (state == FLAC__STREAM_DECODER_ABORTED) {
-			FLAC__stream_decoder_flush(pfd->decoder);
-			fn->min_iqs = pfd->unconsumed + 1;
-			break;
-		}
-		fn->min_iqs = 0;
+	if (output_queue_full(btrn)) {
+		pfd->have_more = true;
+		ret = 1;
+		goto out;
 	}
+	pfd->have_more = false;
+	FLAC__StreamDecoderState state;
+	FLAC__stream_decoder_process_single(pfd->decoder);
+	state = FLAC__stream_decoder_get_state(pfd->decoder);
+	ret = -E_FLACDEC_EOF;
+	if (state == FLAC__STREAM_DECODER_END_OF_STREAM)
+		goto out;
+	if (state == FLAC__STREAM_DECODER_ABORTED) {
+		FLAC__stream_decoder_flush(pfd->decoder);
+		fn->min_iqs = pfd->unconsumed + 1;
+		ret = 1;
+		goto out;
+	}
+	fn->min_iqs = 0;
 	ret = 1;
 out:
 	t->error = ret;