X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec.c;h=1818d4c06a91532cbeae556d0201616fd89fc981;hp=dd7887d51f830409289f389ffa4bd5fd9f897717;hb=1fe76952bf4244b93808da5e8fc45e92d8b37c58;hpb=40cbbb95e256e63e1e6958e9034311d4904604af

diff --git a/mp3dec.c b/mp3dec.c
index dd7887d5..1818d4c0 100644
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -49,7 +49,6 @@ struct private_mp3dec_data {
 };
 
 /* TODO: Convert all input if possible */
-#define FRAME_HEADER_SIZE 4
 static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 {
 	int i, ret;
@@ -62,11 +61,8 @@ static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 	pmd->stream.error = 0;
 next_frame:
 	ret = mad_header_decode(&pmd->frame.header, &pmd->stream);
-	if (ret < 0) {
-		if (!MAD_RECOVERABLE(pmd->stream.error))
-			goto out;
-		return FRAME_HEADER_SIZE;
-	}
+	if (ret < 0)
+		goto out;
 	fn->fc->samplerate = pmd->frame.header.samplerate;
 	fn->fc->channels = MAD_NCHANNELS(&pmd->frame.header);
 	ret = mad_frame_decode(&pmd->frame, &pmd->stream);
@@ -98,8 +94,8 @@ next_frame:
 out:
 	if (pmd->stream.next_frame) { /* we still have some data */
 		size_t off = pmd->stream.bufend - pmd->stream.next_frame;
-		PARA_DEBUG_LOG("converted %zd, rate: %u, returning %zd\n", len - off,
-			fn->fc->samplerate, copy - off);
+//		PARA_INFO_LOG("off: %zd, rate: %u, returning %zd\n", off,
+//			fn->fc->samplerate, copy - off);
 		return copy - off;
 	}
 	return copy;