X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec.c;h=16599411820313eae492a604fb58d09b1221b752;hp=0100d04ea7d8a191a57c7264972870756d53ded4;hb=4591d3022ef21b5148a604d1099eacd85570bde0;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623;ds=sidebyside

diff --git a/mp3dec.c b/mp3dec.c
index 0100d04e..16599411 100644
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -1,51 +1,33 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file mp3dec.c paraslash's mp3 decoder */
+/** \file mp3dec.c Paraslash's mp3 decoder. */
 
-#include "gcc-compat.h"
 #include "para.h"
-
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "error.h"
 #include <mad.h>
 #include "string.h"
 
-/** the output buffer size */
-#define MP3_OUTBUF_SIZE 128 * 1024
+/** The output buffer size. */
+#define MP3_OUTBUF_SIZE (128 * 1024)
 
-/** \cond a helper macro */
-#define MAD_TO_SHORT(f) (f) >= MAD_F_ONE?  SHRT_MAX :\
+/** Convert a sample value from libmad to a signed short. */
+#define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
 	(f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
-/** \endcond */
 
-/**
- * data specific to the mp3dec filter
- *
- * \sa filter, filter_node
- */
+/** Data specific to the mp3dec filter. */
 struct private_mp3dec_data {
-	/** information on the current mp3 stream */
+	/** Information on the current mp3 stream. */
 	struct mad_stream stream;
-	/** information about the frame which is currently decoded */
+	/** Information about the frame which is currently decoded. */
 	struct mad_frame frame;
-	/** contains the PCM output */
+	/** Contains the PCM output. */
 	struct mad_synth synth;
 };
 
@@ -53,37 +35,39 @@ static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 {
 	int i, ret;
 	struct private_mp3dec_data *pmd = fn->private_data;
-	size_t copy = MIN(len, 4096);
+	size_t copy = PARA_MIN(len, 4096);
 
 	if (fn->loaded > fn->bufsize * 4 / 5)
 		return 0;
 	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)
+		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);
 	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 */
-		signed short s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
-		fn->buf[fn->loaded++] = s & 0xff;
-		fn->buf[fn->loaded++] = s >> 8;
+		int s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
+		write_int16_host_endian(fn->buf + fn->loaded, s);
+		fn->loaded += 2;
 		if (MAD_NCHANNELS(&pmd->frame.header) == 2) { /* stereo */
 			s = MAD_TO_SHORT(pmd->synth.pcm.samples[1][i]);
-			fn->buf[fn->loaded++] = s & 0xff;
-			fn->buf[fn->loaded++] = s >> 8;
+			write_int16_host_endian(fn->buf + fn->loaded, s);
+			fn->loaded += 2;
 		}
 		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)
@@ -91,8 +75,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;
@@ -124,10 +108,13 @@ static void mp3dec_open(struct filter_node *fn)
 	fn->bufsize = MP3_OUTBUF_SIZE;
 	fn->buf = para_calloc(fn->bufsize);
 }
+
 /**
- * the init function of the mp3dec filter
+ * The init function of the mp3dec filter.
+ *
+ * \param f Pointer to the filter struct to initialize.
  *
- * \sa filter::init
+ * \sa filter::init.
  */
 void mp3dec_init(struct filter *f)
 {