X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec.c;h=fc2b9d8c0f2aa259e49d02041b152ab5814faf2e;hp=4599df90b6fd42f712a7203069220c45bf579ec1;hb=d7f72444e863fb5aae145d4e720cd71dc03578b0;hpb=a8a78f935dcefa8a7fcda8dae80bca64fe39d632

diff --git a/mp3dec.c b/mp3dec.c
index 4599df90..fc2b9d8c 100644
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -19,8 +19,8 @@
 /** \file mp3dec.c paraslash's mp3 decoder */
 
 #include "para.h"
-
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "error.h"
 #include <mad.h>
@@ -48,6 +48,8 @@ struct private_mp3dec_data {
 	struct mad_synth synth;
 };
 
+/* 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;
@@ -59,16 +61,22 @@ static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 	mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
 	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;
+	}
+	fn->fc->samplerate = pmd->frame.header.samplerate;
+	fn->fc->channels = MAD_NCHANNELS(&pmd->frame.header);
 	ret = mad_frame_decode(&pmd->frame, &pmd->stream);
 	if (ret) {
 		if (MAD_RECOVERABLE(pmd->stream.error) || pmd->stream.error == MAD_ERROR_BUFLEN)
 			goto out;
-		PARA_ERROR_LOG("fatal: ret = %d, loaded = %d\n", ret, fn->loaded);
+		PARA_ERROR_LOG("fatal: ret = %d, loaded = %zd\n", ret, fn->loaded);
 		return -E_MAD_FRAME_DECODE;
 	}
 	mad_synth_frame(&pmd->synth, &pmd->frame);
-	fn->fci->samplerate = pmd->frame.header.samplerate;
-	fn->fci->channels = MAD_NCHANNELS(&pmd->frame.header);
 
 	for (i = 0; i < pmd->synth.pcm.length; i++) {
 		/* output format: unsigned 16 bit little endian */
@@ -82,7 +90,7 @@ next_frame:
 		}
 		if (fn->loaded != fn->bufsize) /* output buffer not full */
 			continue;
-		PARA_ERROR_LOG("output buffer full: %d\n", fn->loaded);
+		PARA_ERROR_LOG("output buffer full: %zd\n", fn->loaded);
 			return -E_MP3DEC_OVERRUN;
 	}
 	if (fn->loaded <= fn->bufsize * 4 / 5)
@@ -90,8 +98,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 %d, %d input bytes, %d output bytes\n",
-			len - off, off, fn->loaded);
+//		PARA_INFO_LOG("off: %zd, rate: %u, returning %zd\n", off,
+//			fn->fc->samplerate, copy - off);
 		return copy - off;
 	}
 	return copy;