Re-tagging 0.13.0 release to fix a couple of bugs with the tarball.

git-svn-id: https://svn.musicpd.org/mpd/tags/release-0.13.0@6325 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 359 insertions, 0 deletions

diff --git a/trunk/src/inputPlugins/mpc_plugin.c b/trunk/src/inputPlugins/mpc_plugin.c
new file mode 100644
index 000000000..885f6cfc9
--- /dev/null
+++ b/trunk/src/inputPlugins/mpc_plugin.c
@@ -0,0 +1,359 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: http://www.musicpd.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-1307  USA
+ */
+
+#include "../inputPlugin.h"
+
+#ifdef HAVE_MPCDEC
+
+#include "../utils.h"
+#include "../audio.h"
+#include "../log.h"
+#include "../pcm_utils.h"
+#include "../inputStream.h"
+#include "../outputBuffer.h"
+#include "../replayGain.h"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <mpcdec/mpcdec.h>
+#include <errno.h>
+#include <math.h>
+
+typedef struct _MpcCallbackData {
+	InputStream *inStream;
+	DecoderControl *dc;
+} MpcCallbackData;
+
+static mpc_int32_t mpc_read_cb(void *vdata, void *ptr, mpc_int32_t size)
+{
+	mpc_int32_t ret = 0;
+	MpcCallbackData *data = (MpcCallbackData *) vdata;
+
+	while (1) {
+		ret = readFromInputStream(data->inStream, ptr, 1, size);
+		if (ret == 0 && !inputStreamAtEOF(data->inStream) &&
+		    (data->dc && !data->dc->stop)) {
+			my_usleep(10000);
+		} else
+			break;
+	}
+
+	return ret;
+}
+
+static mpc_bool_t mpc_seek_cb(void *vdata, mpc_int32_t offset)
+{
+	MpcCallbackData *data = (MpcCallbackData *) vdata;
+
+	return seekInputStream(data->inStream, offset, SEEK_SET) < 0 ? 0 : 1;
+}
+
+static mpc_int32_t mpc_tell_cb(void *vdata)
+{
+	MpcCallbackData *data = (MpcCallbackData *) vdata;
+
+	return (long)(data->inStream->offset);
+}
+
+static mpc_bool_t mpc_canseek_cb(void *vdata)
+{
+	MpcCallbackData *data = (MpcCallbackData *) vdata;
+
+	return data->inStream->seekable;
+}
+
+static mpc_int32_t mpc_getsize_cb(void *vdata)
+{
+	MpcCallbackData *data = (MpcCallbackData *) vdata;
+
+	return data->inStream->size;
+}
+
+/* this _looks_ performance-critical, don't de-inline -- eric */
+static inline mpd_sint16 convertSample(MPC_SAMPLE_FORMAT sample)
+{
+	/* only doing 16-bit audio for now */
+	mpd_sint32 val;
+
+	const int clip_min = -1 << (16 - 1);
+	const int clip_max = (1 << (16 - 1)) - 1;
+
+#ifdef MPC_FIXED_POINT
+	const int shift = 16 - MPC_FIXED_POINT_SCALE_SHIFT;
+
+	if (sample > 0) {
+		sample <<= shift;
+	} else if (shift < 0) {
+		sample >>= -shift;
+	}
+	val = sample;
+#else
+	const int float_scale = 1 << (16 - 1);
+
+	val = sample * float_scale;
+#endif
+
+	if (val < clip_min)
+		val = clip_min;
+	else if (val > clip_max)
+		val = clip_max;
+
+	return val;
+}
+
+static int mpc_decode(OutputBuffer * cb, DecoderControl * dc,
+		      InputStream * inStream)
+{
+	mpc_decoder decoder;
+	mpc_reader reader;
+	mpc_streaminfo info;
+
+	MpcCallbackData data;
+
+	MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH];
+
+	int eof = 0;
+	long ret;
+#define MPC_CHUNK_SIZE 4096
+	char chunk[MPC_CHUNK_SIZE];
+	int chunkpos = 0;
+	long bitRate = 0;
+	mpd_sint16 *s16 = (mpd_sint16 *) chunk;
+	unsigned long samplePos = 0;
+	mpc_uint32_t vbrUpdateAcc;
+	mpc_uint32_t vbrUpdateBits;
+	float time;
+	int i;
+	ReplayGainInfo *replayGainInfo = NULL;
+
+	data.inStream = inStream;
+	data.dc = dc;
+
+	reader.read = mpc_read_cb;
+	reader.seek = mpc_seek_cb;
+	reader.tell = mpc_tell_cb;
+	reader.get_size = mpc_getsize_cb;
+	reader.canseek = mpc_canseek_cb;
+	reader.data = &data;
+
+	mpc_streaminfo_init(&info);
+
+	if ((ret = mpc_streaminfo_read(&info, &reader)) != ERROR_CODE_OK) {
+		closeInputStream(inStream);
+		if (!dc->stop) {
+			ERROR("Not a valid musepack stream");
+			return -1;
+		} else {
+			dc->state = DECODE_STATE_STOP;
+			dc->stop = 0;
+		}
+		return 0;
+	}
+
+	mpc_decoder_setup(&decoder, &reader);
+
+	if (!mpc_decoder_initialize(&decoder, &info)) {
+		closeInputStream(inStream);
+		if (!dc->stop) {
+			ERROR("Not a valid musepack stream");
+		} else {
+			dc->state = DECODE_STATE_STOP;
+			dc->stop = 0;
+		}
+	}
+
+	dc->totalTime = mpc_streaminfo_get_length(&info);
+
+	dc->audioFormat.bits = 16;
+	dc->audioFormat.channels = info.channels;
+	dc->audioFormat.sampleRate = info.sample_freq;
+
+	getOutputAudioFormat(&(dc->audioFormat), &(cb->audioFormat));
+
+	replayGainInfo = newReplayGainInfo();
+	replayGainInfo->albumGain = info.gain_album * 0.01;
+	replayGainInfo->albumPeak = info.peak_album / 32767.0;
+	replayGainInfo->trackGain = info.gain_title * 0.01;
+	replayGainInfo->trackPeak = info.peak_title / 32767.0;
+
+	dc->state = DECODE_STATE_DECODE;
+
+	while (!eof) {
+		if (dc->seek) {
+			samplePos = dc->seekWhere * dc->audioFormat.sampleRate;
+			if (mpc_decoder_seek_sample(&decoder, samplePos)) {
+				clearOutputBuffer(cb);
+				s16 = (mpd_sint16 *) chunk;
+				chunkpos = 0;
+			} else
+				dc->seekError = 1;
+			dc->seek = 0;
+		}
+
+		vbrUpdateAcc = 0;
+		vbrUpdateBits = 0;
+		ret = mpc_decoder_decode(&decoder, sample_buffer,
+					 &vbrUpdateAcc, &vbrUpdateBits);
+
+		if (ret <= 0 || dc->stop) {
+			eof = 1;
+			break;
+		}
+
+		samplePos += ret;
+
+		/* ret is in samples, and we have stereo */
+		ret *= 2;
+
+		for (i = 0; i < ret; i++) {
+			/* 16 bit audio again */
+			*s16 = convertSample(sample_buffer[i]);
+			chunkpos += 2;
+			s16++;
+
+			if (chunkpos >= MPC_CHUNK_SIZE) {
+				time = ((float)samplePos) /
+				    dc->audioFormat.sampleRate;
+
+				bitRate = vbrUpdateBits *
+				    dc->audioFormat.sampleRate / 1152 / 1000;
+
+				sendDataToOutputBuffer(cb, inStream, dc,
+						       inStream->seekable,
+						       chunk, chunkpos,
+						       time,
+						       bitRate, replayGainInfo);
+
+				chunkpos = 0;
+				s16 = (mpd_sint16 *) chunk;
+				if (dc->stop) {
+					eof = 1;
+					break;
+				}
+			}
+		}
+	}
+
+	if (!dc->stop && chunkpos > 0) {
+		time = ((float)samplePos) / dc->audioFormat.sampleRate;
+
+		bitRate =
+		    vbrUpdateBits * dc->audioFormat.sampleRate / 1152 / 1000;
+
+		sendDataToOutputBuffer(cb, NULL, dc, inStream->seekable,
+				       chunk, chunkpos, time, bitRate,
+				       replayGainInfo);
+	}
+
+	closeInputStream(inStream);
+
+	flushOutputBuffer(cb);
+
+	freeReplayGainInfo(replayGainInfo);
+
+	if (dc->stop) {
+		dc->state = DECODE_STATE_STOP;
+		dc->stop = 0;
+	} else {
+		dc->state = DECODE_STATE_STOP;
+	}
+
+	return 0;
+}
+
+static float mpcGetTime(char *file)
+{
+	InputStream inStream;
+	float time = -1;
+
+	mpc_reader reader;
+	mpc_streaminfo info;
+	MpcCallbackData data;
+
+	data.inStream = &inStream;
+	data.dc = NULL;
+
+	reader.read = mpc_read_cb;
+	reader.seek = mpc_seek_cb;
+	reader.tell = mpc_tell_cb;
+	reader.get_size = mpc_getsize_cb;
+	reader.canseek = mpc_canseek_cb;
+	reader.data = &data;
+
+	mpc_streaminfo_init(&info);
+
+	if (openInputStream(&inStream, file) < 0) {
+		DEBUG("mpcGetTime: Failed to open file: %s\n", file);
+		return -1;
+	}
+
+	if (mpc_streaminfo_read(&info, &reader) != ERROR_CODE_OK) {
+		closeInputStream(&inStream);
+		return -1;
+	}
+
+	time = mpc_streaminfo_get_length(&info);
+
+	closeInputStream(&inStream);
+
+	return time;
+}
+
+static MpdTag *mpcTagDup(char *file)
+{
+	MpdTag *ret = NULL;
+	float time = mpcGetTime(file);
+
+	if (time < 0) {
+		DEBUG("mpcTagDup: Failed to get Songlength of file: %s\n",
+		      file);
+		return NULL;
+	}
+
+	ret = apeDup(file);
+	if (!ret)
+		ret = id3Dup(file);
+	if (!ret)
+		ret = newMpdTag();
+	ret->time = time;
+
+	return ret;
+}
+
+static char *mpcSuffixes[] = { "mpc", NULL };
+
+InputPlugin mpcPlugin = {
+	"mpc",
+	NULL,
+	NULL,
+	NULL,
+	mpc_decode,
+	NULL,
+	mpcTagDup,
+	INPUT_PLUGIN_STREAM_URL | INPUT_PLUGIN_STREAM_FILE,
+	mpcSuffixes,
+	NULL
+};
+
+#else
+
+InputPlugin mpcPlugin;
+
+#endif /* HAVE_MPCDEC */