2005-02-01 03:00:25 +01:00
|
|
|
/* the Music Player Daemon (MPD)
|
2007-04-05 05:22:33 +02:00
|
|
|
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
2005-02-01 03:00:25 +01:00
|
|
|
* 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"
|
|
|
|
|
2005-07-30 12:28:43 +02:00
|
|
|
#ifdef HAVE_MPCDEC
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
#include "../utils.h"
|
|
|
|
#include "../audio.h"
|
|
|
|
#include "../log.h"
|
|
|
|
#include "../pcm_utils.h"
|
|
|
|
#include "../inputStream.h"
|
|
|
|
#include "../outputBuffer.h"
|
2005-02-01 06:26:37 +01:00
|
|
|
#include "../replayGain.h"
|
2008-01-03 08:29:49 +01:00
|
|
|
#include "../os_compat.h"
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2005-07-30 12:28:43 +02:00
|
|
|
#include <mpcdec/mpcdec.h>
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
typedef struct _MpcCallbackData {
|
2006-07-20 18:02:40 +02:00
|
|
|
InputStream *inStream;
|
|
|
|
DecoderControl *dc;
|
2005-02-01 03:00:25 +01:00
|
|
|
} MpcCallbackData;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static mpc_int32_t mpc_read_cb(void *vdata, void *ptr, mpc_int32_t size)
|
|
|
|
{
|
2005-02-01 03:00:25 +01:00
|
|
|
mpc_int32_t ret = 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
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;
|
|
|
|
}
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static mpc_bool_t mpc_seek_cb(void *vdata, mpc_int32_t offset)
|
|
|
|
{
|
|
|
|
MpcCallbackData *data = (MpcCallbackData *) vdata;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
return seekInputStream(data->inStream, offset, SEEK_SET) < 0 ? 0 : 1;
|
2005-02-01 03:00:25 +01:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static mpc_int32_t mpc_tell_cb(void *vdata)
|
|
|
|
{
|
|
|
|
MpcCallbackData *data = (MpcCallbackData *) vdata;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
return (long)(data->inStream->offset);
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static mpc_bool_t mpc_canseek_cb(void *vdata)
|
|
|
|
{
|
|
|
|
MpcCallbackData *data = (MpcCallbackData *) vdata;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
return data->inStream->seekable;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static mpc_int32_t mpc_getsize_cb(void *vdata)
|
|
|
|
{
|
|
|
|
MpcCallbackData *data = (MpcCallbackData *) vdata;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
return data->inStream->size;
|
|
|
|
}
|
|
|
|
|
2006-07-15 15:42:57 +02:00
|
|
|
/* this _looks_ performance-critical, don't de-inline -- eric */
|
2006-07-20 18:02:40 +02:00
|
|
|
static inline mpd_sint16 convertSample(MPC_SAMPLE_FORMAT sample)
|
|
|
|
{
|
2005-02-01 04:20:16 +01:00
|
|
|
/* only doing 16-bit audio for now */
|
|
|
|
mpd_sint32 val;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
const int clip_min = -1 << (16 - 1);
|
|
|
|
const int clip_max = (1 << (16 - 1)) - 1;
|
|
|
|
|
2005-02-01 04:20:16 +01:00
|
|
|
#ifdef MPC_FIXED_POINT
|
|
|
|
const int shift = 16 - MPC_FIXED_POINT_SCALE_SHIFT;
|
|
|
|
|
2006-08-07 23:23:03 +02:00
|
|
|
if (sample > 0) {
|
2005-02-01 04:20:16 +01:00
|
|
|
sample <<= shift;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if (shift < 0) {
|
2005-02-01 04:20:16 +01:00
|
|
|
sample >>= -shift;
|
|
|
|
}
|
|
|
|
val = sample;
|
|
|
|
#else
|
|
|
|
const int float_scale = 1 << (16 - 1);
|
|
|
|
|
|
|
|
val = sample * float_scale;
|
|
|
|
#endif
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (val < clip_min)
|
|
|
|
val = clip_min;
|
|
|
|
else if (val > clip_max)
|
|
|
|
val = clip_max;
|
2005-02-01 04:20:16 +01:00
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static int mpc_decode(OutputBuffer * cb, DecoderControl * dc,
|
|
|
|
InputStream * inStream)
|
2005-02-01 03:00:25 +01:00
|
|
|
{
|
|
|
|
mpc_decoder decoder;
|
|
|
|
mpc_reader reader;
|
|
|
|
mpc_streaminfo info;
|
|
|
|
|
|
|
|
MpcCallbackData data;
|
2005-02-01 04:20:16 +01:00
|
|
|
|
|
|
|
MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH];
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
int eof = 0;
|
|
|
|
long ret;
|
|
|
|
#define MPC_CHUNK_SIZE 4096
|
|
|
|
char chunk[MPC_CHUNK_SIZE];
|
|
|
|
int chunkpos = 0;
|
|
|
|
long bitRate = 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
mpd_sint16 *s16 = (mpd_sint16 *) chunk;
|
2005-02-01 04:20:16 +01:00
|
|
|
unsigned long samplePos = 0;
|
|
|
|
mpc_uint32_t vbrUpdateAcc;
|
|
|
|
mpc_uint32_t vbrUpdateBits;
|
2008-01-26 13:46:21 +01:00
|
|
|
float total_time;
|
2005-02-01 04:20:16 +01:00
|
|
|
int i;
|
2006-07-20 18:02:40 +02:00
|
|
|
ReplayGainInfo *replayGainInfo = NULL;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
data.inStream = inStream;
|
|
|
|
data.dc = dc;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
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);
|
2006-07-20 18:02:40 +02:00
|
|
|
|
|
|
|
if ((ret = mpc_streaminfo_read(&info, &reader)) != ERROR_CODE_OK) {
|
|
|
|
if (!dc->stop) {
|
2007-08-27 23:03:22 +02:00
|
|
|
ERROR("Not a valid musepack stream\n");
|
2005-02-01 06:26:37 +01:00
|
|
|
return -1;
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
return 0;
|
2005-02-01 03:00:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
mpc_decoder_setup(&decoder, &reader);
|
2005-02-01 14:22:58 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!mpc_decoder_initialize(&decoder, &info)) {
|
|
|
|
if (!dc->stop) {
|
2007-08-27 23:03:22 +02:00
|
|
|
ERROR("Not a valid musepack stream\n");
|
2008-01-01 04:01:58 +01:00
|
|
|
return -1;
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
2008-01-01 04:01:58 +01:00
|
|
|
return 0;
|
2005-02-01 03:00:25 +01:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2005-02-01 04:20:16 +01:00
|
|
|
dc->totalTime = mpc_streaminfo_get_length(&info);
|
2005-02-01 03:00:25 +01:00
|
|
|
|
|
|
|
dc->audioFormat.bits = 16;
|
2005-02-02 05:05:19 +01:00
|
|
|
dc->audioFormat.channels = info.channels;
|
2005-02-01 04:20:16 +01:00
|
|
|
dc->audioFormat.sampleRate = info.sample_freq;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2005-02-01 14:22:58 +01:00
|
|
|
getOutputAudioFormat(&(dc->audioFormat), &(cb->audioFormat));
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2005-02-02 05:05:19 +01:00
|
|
|
replayGainInfo = newReplayGainInfo();
|
2005-03-07 02:30:29 +01:00
|
|
|
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;
|
2005-02-02 05:05:19 +01:00
|
|
|
|
2005-02-01 14:22:58 +01:00
|
|
|
dc->state = DECODE_STATE_DECODE;
|
2005-02-01 06:26:37 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
while (!eof) {
|
|
|
|
if (dc->seek) {
|
2005-02-01 04:20:16 +01:00
|
|
|
samplePos = dc->seekWhere * dc->audioFormat.sampleRate;
|
2006-07-20 18:02:40 +02:00
|
|
|
if (mpc_decoder_seek_sample(&decoder, samplePos)) {
|
|
|
|
clearOutputBuffer(cb);
|
2006-08-08 02:56:05 +02:00
|
|
|
s16 = (mpd_sint16 *) chunk;
|
2006-07-20 18:02:40 +02:00
|
|
|
chunkpos = 0;
|
|
|
|
} else
|
|
|
|
dc->seekError = 1;
|
2005-02-01 03:00:25 +01:00
|
|
|
dc->seek = 0;
|
Initial cut of fork() => pthreads() for decoder and player
I initially started to do a heavy rewrite that changed the way processes
communicated, but that was too much to do at once. So this change only
focuses on replacing the player and decode processes with threads and
using condition variables instead of polling in loops; so the changeset
itself is quiet small.
* The shared output buffer variables will still need locking
to guard against race conditions. So in this effect, we're probably
just as buggy as before. The reduced context-switching overhead of
using threads instead of processes may even make bugs show up more or
less often...
* Basic functionality appears to be working for playing local (and NFS)
audio, including:
play, pause, stop, seek, previous, next, and main playlist editing
* I haven't tested HTTP streams yet, they should work.
* I've only tested ALSA and Icecast. ALSA works fine, Icecast
metadata seems to get screwy at times and breaks song
advancement in the playlist at times.
* state file loading works, too (after some last-minute hacks with
non-blocking wakeup functions)
* The non-blocking (*_nb) variants of the task management functions are
probably overused. They're more lenient and easier to use because
much of our code is still based on our previous polling-based system.
* It currently segfaults on exit. I haven't paid much attention
to the exit/signal-handling routines other than ensuring it
compiles. At least the state file seems to work. We don't
do any cleanups of the threads on exit, yet.
* Update is still done in a child process and not in a thread.
To do this in a thread, we'll need to ensure it does proper
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
master - just does waitpid() + fork() in a loop
\- main thread
\- decoder thread
\- player thread
At the beginning of every song, the main thread will set
a dirty flag and update the state file. This way, if we
encounter a song that triggers a segfault killing the
main thread, the master will start the replacement main
on the next song.
* The main thread still wakes up every second on select()
to check for signals; which affects power management.
[merged r7138 from branches/ew]
git-svn-id: https://svn.musicpd.org/mpd/trunk@7240 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2008-04-12 06:08:00 +02:00
|
|
|
decoder_wakeup_player();
|
2005-02-01 03:00:25 +01:00
|
|
|
}
|
2005-02-01 14:22:58 +01:00
|
|
|
|
2005-08-07 12:05:57 +02:00
|
|
|
vbrUpdateAcc = 0;
|
|
|
|
vbrUpdateBits = 0;
|
2005-02-01 06:26:37 +01:00
|
|
|
ret = mpc_decoder_decode(&decoder, sample_buffer,
|
2006-07-20 18:02:40 +02:00
|
|
|
&vbrUpdateAcc, &vbrUpdateBits);
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (ret <= 0 || dc->stop) {
|
2005-02-01 03:00:25 +01:00
|
|
|
eof = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2005-02-01 04:20:16 +01:00
|
|
|
samplePos += ret;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2005-02-01 04:20:16 +01:00
|
|
|
/* ret is in samples, and we have stereo */
|
|
|
|
ret *= 2;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
for (i = 0; i < ret; i++) {
|
2005-02-01 04:20:16 +01:00
|
|
|
/* 16 bit audio again */
|
|
|
|
*s16 = convertSample(sample_buffer[i]);
|
|
|
|
chunkpos += 2;
|
|
|
|
s16++;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (chunkpos >= MPC_CHUNK_SIZE) {
|
2008-01-26 13:46:21 +01:00
|
|
|
total_time = ((float)samplePos) /
|
2006-07-20 18:02:40 +02:00
|
|
|
dc->audioFormat.sampleRate;
|
|
|
|
|
|
|
|
bitRate = vbrUpdateBits *
|
|
|
|
dc->audioFormat.sampleRate / 1152 / 1000;
|
|
|
|
|
|
|
|
sendDataToOutputBuffer(cb, inStream, dc,
|
|
|
|
inStream->seekable,
|
|
|
|
chunk, chunkpos,
|
2008-01-26 13:46:21 +01:00
|
|
|
total_time,
|
2006-07-20 18:02:40 +02:00
|
|
|
bitRate, replayGainInfo);
|
2005-02-02 05:05:19 +01:00
|
|
|
|
2005-02-01 04:20:16 +01:00
|
|
|
chunkpos = 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
s16 = (mpd_sint16 *) chunk;
|
|
|
|
if (dc->stop) {
|
2005-02-02 03:21:58 +01:00
|
|
|
eof = 1;
|
|
|
|
break;
|
|
|
|
}
|
2005-02-01 04:20:16 +01:00
|
|
|
}
|
2005-02-01 03:00:25 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!dc->stop && chunkpos > 0) {
|
2008-01-26 13:46:21 +01:00
|
|
|
total_time = ((float)samplePos) / dc->audioFormat.sampleRate;
|
2005-02-01 04:20:16 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
bitRate =
|
|
|
|
vbrUpdateBits * dc->audioFormat.sampleRate / 1152 / 1000;
|
2005-02-01 04:20:16 +01:00
|
|
|
|
2005-02-01 03:00:25 +01:00
|
|
|
sendDataToOutputBuffer(cb, NULL, dc, inStream->seekable,
|
2008-01-26 13:46:21 +01:00
|
|
|
chunk, chunkpos, total_time, bitRate,
|
2005-02-02 05:05:19 +01:00
|
|
|
replayGainInfo);
|
2005-02-01 03:00:25 +01:00
|
|
|
}
|
|
|
|
|
2005-02-02 03:21:58 +01:00
|
|
|
flushOutputBuffer(cb);
|
|
|
|
|
2005-02-02 05:05:19 +01:00
|
|
|
freeReplayGainInfo(replayGainInfo);
|
|
|
|
|
2005-02-01 03:00:25 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static float mpcGetTime(char *file)
|
|
|
|
{
|
2005-03-07 01:51:21 +01:00
|
|
|
InputStream inStream;
|
2008-01-26 13:46:21 +01:00
|
|
|
float total_time = -1;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2005-03-07 01:51:21 +01:00
|
|
|
mpc_reader reader;
|
|
|
|
mpc_streaminfo info;
|
|
|
|
MpcCallbackData data;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
data.inStream = &inStream;
|
|
|
|
data.dc = NULL;
|
2005-03-07 01:51:21 +01:00
|
|
|
|
|
|
|
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);
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (openInputStream(&inStream, file) < 0) {
|
2005-09-08 23:08:02 +02:00
|
|
|
DEBUG("mpcGetTime: Failed to open file: %s\n", file);
|
|
|
|
return -1;
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
|
|
|
|
if (mpc_streaminfo_read(&info, &reader) != ERROR_CODE_OK) {
|
2005-03-07 01:51:21 +01:00
|
|
|
closeInputStream(&inStream);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-01-26 13:46:21 +01:00
|
|
|
total_time = mpc_streaminfo_get_length(&info);
|
2005-03-07 01:51:21 +01:00
|
|
|
|
|
|
|
closeInputStream(&inStream);
|
|
|
|
|
2008-01-26 13:46:21 +01:00
|
|
|
return total_time;
|
2005-03-07 01:51:21 +01:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static MpdTag *mpcTagDup(char *file)
|
|
|
|
{
|
|
|
|
MpdTag *ret = NULL;
|
2008-01-26 13:46:21 +01:00
|
|
|
float total_time = mpcGetTime(file);
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2008-01-26 13:46:21 +01:00
|
|
|
if (total_time < 0) {
|
2006-07-20 18:02:40 +02:00
|
|
|
DEBUG("mpcTagDup: Failed to get Songlength of file: %s\n",
|
|
|
|
file);
|
|
|
|
return NULL;
|
2005-09-08 23:08:02 +02:00
|
|
|
}
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2005-03-07 01:51:21 +01:00
|
|
|
ret = apeDup(file);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!ret)
|
|
|
|
ret = id3Dup(file);
|
|
|
|
if (!ret)
|
|
|
|
ret = newMpdTag();
|
2008-01-26 13:46:21 +01:00
|
|
|
ret->time = total_time;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
return ret;
|
2005-02-01 03:00:25 +01:00
|
|
|
}
|
|
|
|
|
2008-02-05 11:17:33 +01:00
|
|
|
static const char *mpcSuffixes[] = { "mpc", NULL };
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
InputPlugin mpcPlugin = {
|
|
|
|
"mpc",
|
|
|
|
NULL,
|
2005-02-01 03:00:25 +01:00
|
|
|
NULL,
|
|
|
|
NULL,
|
2006-07-20 18:02:40 +02:00
|
|
|
mpc_decode,
|
2006-03-16 07:52:46 +01:00
|
|
|
NULL,
|
2006-07-20 18:02:40 +02:00
|
|
|
mpcTagDup,
|
|
|
|
INPUT_PLUGIN_STREAM_URL | INPUT_PLUGIN_STREAM_FILE,
|
|
|
|
mpcSuffixes,
|
2007-05-23 01:34:26 +02:00
|
|
|
NULL
|
2005-02-01 03:00:25 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
2007-01-14 04:07:53 +01:00
|
|
|
InputPlugin mpcPlugin;
|
2005-02-01 03:00:25 +01:00
|
|
|
|
2007-04-09 14:24:48 +02:00
|
|
|
#endif /* HAVE_MPCDEC */
|