2004-02-24 00:41:20 +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)
|
2004-02-24 00:41:20 +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
|
|
|
|
*/
|
|
|
|
|
2004-05-31 03:21:17 +02:00
|
|
|
#include "../inputPlugin.h"
|
2004-03-18 04:29:25 +01:00
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
#ifdef HAVE_MAD
|
|
|
|
|
2004-05-31 03:21:17 +02:00
|
|
|
#include "../pcm_utils.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
#include <mad.h>
|
2006-07-16 19:49:15 +02:00
|
|
|
|
2004-03-05 02:29:08 +01:00
|
|
|
#ifdef HAVE_ID3TAG
|
|
|
|
#include <id3tag.h>
|
|
|
|
#endif
|
2006-07-16 19:49:15 +02:00
|
|
|
|
2004-05-31 03:21:17 +02:00
|
|
|
#include "../log.h"
|
|
|
|
#include "../utils.h"
|
2006-01-14 23:47:16 +01:00
|
|
|
#include "../replayGain.h"
|
2004-05-31 03:21:17 +02:00
|
|
|
#include "../tag.h"
|
2006-12-23 19:00:15 +01:00
|
|
|
#include "../conf.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-01-03 08:29:49 +01:00
|
|
|
#include "../os_compat.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
#define FRAMES_CUSHION 2000
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
#define READ_BUFFER_SIZE 40960
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
#define DECODE_SKIP -3
|
|
|
|
#define DECODE_BREAK -2
|
|
|
|
#define DECODE_CONT -1
|
|
|
|
#define DECODE_OK 0
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
#define MUTEFRAME_SKIP 1
|
|
|
|
#define MUTEFRAME_SEEK 2
|
2004-05-20 06:00:17 +02:00
|
|
|
|
2006-07-26 05:10:19 +02:00
|
|
|
/* the number of samples of silence the decoder inserts at start */
|
|
|
|
#define DECODERDELAY 529
|
|
|
|
|
2006-12-23 19:00:15 +01:00
|
|
|
#define DEFAULT_GAPLESS_MP3_PLAYBACK 1
|
|
|
|
|
2007-06-03 21:25:25 +02:00
|
|
|
static int gaplessPlaybackEnabled;
|
2006-12-23 19:00:15 +01:00
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
/* this is stolen from mpg321! */
|
|
|
|
struct audio_dither {
|
|
|
|
mad_fixed_t error[3];
|
|
|
|
mad_fixed_t random;
|
|
|
|
};
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static unsigned long prng(unsigned long state)
|
|
|
|
{
|
2004-02-24 00:41:20 +01:00
|
|
|
return (state * 0x0019660dL + 0x3c6ef35fL) & 0xffffffffL;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static signed long audio_linear_dither(unsigned int bits, mad_fixed_t sample,
|
|
|
|
struct audio_dither *dither)
|
|
|
|
{
|
2004-02-24 00:41:20 +01:00
|
|
|
unsigned int scalebits;
|
2008-01-26 13:46:21 +01:00
|
|
|
mad_fixed_t output, mask, rnd;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
enum {
|
|
|
|
MIN = -MAD_F_ONE,
|
2006-07-20 18:02:40 +02:00
|
|
|
MAX = MAD_F_ONE - 1
|
2004-02-24 00:41:20 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
sample += dither->error[0] - dither->error[1] + dither->error[2];
|
|
|
|
|
|
|
|
dither->error[2] = dither->error[1];
|
|
|
|
dither->error[1] = dither->error[0] / 2;
|
|
|
|
|
|
|
|
output = sample + (1L << (MAD_F_FRACBITS + 1 - bits - 1));
|
|
|
|
|
|
|
|
scalebits = MAD_F_FRACBITS + 1 - bits;
|
|
|
|
mask = (1L << scalebits) - 1;
|
|
|
|
|
2008-01-26 13:46:21 +01:00
|
|
|
rnd = prng(dither->random);
|
|
|
|
output += (rnd & mask) - (dither->random & mask);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-01-26 13:46:21 +01:00
|
|
|
dither->random = rnd;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
if (output > MAX) {
|
|
|
|
output = MAX;
|
|
|
|
|
|
|
|
if (sample > MAX)
|
|
|
|
sample = MAX;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if (output < MIN) {
|
|
|
|
output = MIN;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
if (sample < MIN)
|
|
|
|
sample = MIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
output &= ~mask;
|
|
|
|
|
|
|
|
dither->error[0] = sample - output;
|
|
|
|
|
|
|
|
return output >> scalebits;
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
/* end of stolen stuff from mpg321 */
|
|
|
|
|
2006-12-23 19:00:15 +01:00
|
|
|
static int mp3_plugin_init(void)
|
|
|
|
{
|
2007-09-06 01:59:33 +02:00
|
|
|
gaplessPlaybackEnabled = getBoolConfigParam(CONF_GAPLESS_MP3_PLAYBACK,
|
|
|
|
1);
|
|
|
|
if (gaplessPlaybackEnabled == CONF_BOOL_UNSET)
|
2007-06-03 21:25:25 +02:00
|
|
|
gaplessPlaybackEnabled = DEFAULT_GAPLESS_MP3_PLAYBACK;
|
2006-12-23 19:00:15 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
/* decoder stuff is based on madlld */
|
|
|
|
|
2004-05-07 17:58:04 +02:00
|
|
|
#define MP3_DATA_OUTPUT_BUFFER_SIZE 4096
|
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
typedef struct _mp3DecodeData {
|
|
|
|
struct mad_stream stream;
|
|
|
|
struct mad_frame frame;
|
|
|
|
struct mad_synth synth;
|
|
|
|
mad_timer_t timer;
|
|
|
|
unsigned char readBuffer[READ_BUFFER_SIZE];
|
2004-05-07 17:58:04 +02:00
|
|
|
char outputBuffer[MP3_DATA_OUTPUT_BUFFER_SIZE];
|
2006-07-20 18:02:40 +02:00
|
|
|
char *outputPtr;
|
|
|
|
char *outputBufferEnd;
|
2004-02-24 00:41:20 +01:00
|
|
|
float totalTime;
|
|
|
|
float elapsedTime;
|
|
|
|
int muteFrame;
|
2006-07-20 18:02:40 +02:00
|
|
|
long *frameOffset;
|
|
|
|
mad_timer_t *times;
|
2004-02-24 00:41:20 +01:00
|
|
|
long highestFrame;
|
|
|
|
long maxFrames;
|
|
|
|
long currentFrame;
|
2006-07-26 05:10:19 +02:00
|
|
|
int dropFramesAtStart;
|
|
|
|
int dropFramesAtEnd;
|
|
|
|
int dropSamplesAtStart;
|
|
|
|
int dropSamplesAtEnd;
|
2006-08-13 04:53:20 +02:00
|
|
|
int foundXing;
|
2006-07-26 05:10:19 +02:00
|
|
|
int foundFirstFrame;
|
|
|
|
int decodedFirstFrame;
|
2004-02-24 00:41:20 +01:00
|
|
|
int flush;
|
|
|
|
unsigned long bitRate;
|
2006-07-20 18:02:40 +02:00
|
|
|
InputStream *inStream;
|
2004-06-20 03:37:18 +02:00
|
|
|
struct audio_dither dither;
|
2006-08-23 15:20:24 +02:00
|
|
|
enum mad_layer layer;
|
2004-02-24 00:41:20 +01:00
|
|
|
} mp3DecodeData;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static void initMp3DecodeData(mp3DecodeData * data, InputStream * inStream)
|
|
|
|
{
|
2004-02-24 00:41:20 +01:00
|
|
|
data->outputPtr = data->outputBuffer;
|
2006-07-20 18:02:40 +02:00
|
|
|
data->outputBufferEnd =
|
|
|
|
data->outputBuffer + MP3_DATA_OUTPUT_BUFFER_SIZE;
|
2004-02-24 00:41:20 +01:00
|
|
|
data->muteFrame = 0;
|
|
|
|
data->highestFrame = 0;
|
|
|
|
data->maxFrames = 0;
|
|
|
|
data->frameOffset = NULL;
|
|
|
|
data->times = NULL;
|
|
|
|
data->currentFrame = 0;
|
2006-07-26 05:10:19 +02:00
|
|
|
data->dropFramesAtStart = 0;
|
|
|
|
data->dropFramesAtEnd = 0;
|
|
|
|
data->dropSamplesAtStart = 0;
|
|
|
|
data->dropSamplesAtEnd = 0;
|
2006-08-13 04:53:20 +02:00
|
|
|
data->foundXing = 0;
|
2006-07-26 05:10:19 +02:00
|
|
|
data->foundFirstFrame = 0;
|
|
|
|
data->decodedFirstFrame = 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
data->flush = 1;
|
2006-07-20 18:02:40 +02:00
|
|
|
data->inStream = inStream;
|
2006-08-23 15:20:24 +02:00
|
|
|
data->layer = 0;
|
2004-06-20 03:37:18 +02:00
|
|
|
memset(&(data->dither), 0, sizeof(struct audio_dither));
|
2004-05-04 21:08:46 +02:00
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
mad_stream_init(&data->stream);
|
2006-05-15 15:48:47 +02:00
|
|
|
mad_stream_options(&data->stream, MAD_OPTION_IGNORECRC);
|
2004-02-24 00:41:20 +01:00
|
|
|
mad_frame_init(&data->frame);
|
|
|
|
mad_synth_init(&data->synth);
|
|
|
|
mad_timer_reset(&data->timer);
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static int seekMp3InputBuffer(mp3DecodeData * data, long offset)
|
|
|
|
{
|
|
|
|
if (seekInputStream(data->inStream, offset, SEEK_SET) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2004-05-20 14:11:28 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
mad_stream_buffer(&data->stream, data->readBuffer, 0);
|
2004-05-20 14:11:28 +02:00
|
|
|
(data->stream).error = 0;
|
2004-05-18 22:27:12 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static int fillMp3InputBuffer(mp3DecodeData * data)
|
|
|
|
{
|
2004-02-24 00:41:20 +01:00
|
|
|
size_t readSize;
|
|
|
|
size_t remaining;
|
2006-07-20 18:02:40 +02:00
|
|
|
size_t readed;
|
|
|
|
unsigned char *readStart;
|
|
|
|
|
|
|
|
if ((data->stream).next_frame != NULL) {
|
|
|
|
remaining = (data->stream).bufend - (data->stream).next_frame;
|
|
|
|
memmove(data->readBuffer, (data->stream).next_frame, remaining);
|
|
|
|
readStart = (data->readBuffer) + remaining;
|
|
|
|
readSize = READ_BUFFER_SIZE - remaining;
|
|
|
|
} else {
|
2004-02-24 00:41:20 +01:00
|
|
|
readSize = READ_BUFFER_SIZE;
|
2006-07-20 18:02:40 +02:00
|
|
|
readStart = data->readBuffer, remaining = 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2005-02-14 01:52:29 +01:00
|
|
|
/* we've exhausted the read buffer, so give up!, these potential
|
|
|
|
* mp3 frames are way too big, and thus unlikely to be mp3 frames */
|
2006-07-20 18:02:40 +02:00
|
|
|
if (readSize == 0)
|
|
|
|
return -1;
|
2005-02-14 01:52:29 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
readed = readFromInputStream(data->inStream, readStart, (size_t) 1,
|
|
|
|
readSize);
|
|
|
|
if (readed <= 0 && inputStreamAtEOF(data->inStream))
|
|
|
|
return -1;
|
2004-05-18 22:27:12 +02:00
|
|
|
/* sleep for a fraction of a second! */
|
2006-07-20 18:02:40 +02:00
|
|
|
else if (readed <= 0) {
|
2004-06-20 03:37:18 +02:00
|
|
|
readed = 0;
|
|
|
|
my_usleep(10000);
|
|
|
|
}
|
2004-05-18 05:37:55 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
mad_stream_buffer(&data->stream, data->readBuffer, readed + remaining);
|
2004-02-24 00:41:20 +01:00
|
|
|
(data->stream).error = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-06-01 14:50:15 +02:00
|
|
|
#ifdef HAVE_ID3TAG
|
2006-07-20 18:02:40 +02:00
|
|
|
static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag)
|
|
|
|
{
|
2006-01-14 23:47:16 +01:00
|
|
|
int i;
|
2006-07-20 18:02:40 +02:00
|
|
|
char *key;
|
|
|
|
char *value;
|
|
|
|
struct id3_frame *frame;
|
2006-01-14 23:47:16 +01:00
|
|
|
int found = 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
ReplayGainInfo *replayGainInfo;
|
2006-01-14 23:47:16 +01:00
|
|
|
|
2006-06-21 18:38:18 +02:00
|
|
|
replayGainInfo = newReplayGainInfo();
|
2006-01-14 23:47:16 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
for (i = 0; (frame = id3_tag_findframe(tag, "TXXX", i)); i++) {
|
|
|
|
if (frame->nfields < 3)
|
|
|
|
continue;
|
2006-01-14 23:47:16 +01:00
|
|
|
|
2006-07-20 20:53:56 +02:00
|
|
|
key = (char *)
|
2006-07-20 18:02:40 +02:00
|
|
|
id3_ucs4_latin1duplicate(id3_field_getstring
|
|
|
|
(&frame->fields[1]));
|
2006-07-20 20:53:56 +02:00
|
|
|
value = (char *)
|
2006-07-20 18:02:40 +02:00
|
|
|
id3_ucs4_latin1duplicate(id3_field_getstring
|
|
|
|
(&frame->fields[2]));
|
2006-01-14 23:47:16 +01:00
|
|
|
|
2006-08-23 21:10:47 +02:00
|
|
|
if (strcasecmp(key, "replaygain_track_gain") == 0) {
|
2006-06-21 18:38:18 +02:00
|
|
|
replayGainInfo->trackGain = atof(value);
|
2006-01-14 23:47:16 +01:00
|
|
|
found = 1;
|
2006-08-23 21:10:47 +02:00
|
|
|
} else if (strcasecmp(key, "replaygain_album_gain") == 0) {
|
2006-06-21 18:38:18 +02:00
|
|
|
replayGainInfo->albumGain = atof(value);
|
2006-01-14 23:47:16 +01:00
|
|
|
found = 1;
|
2006-08-23 21:10:47 +02:00
|
|
|
} else if (strcasecmp(key, "replaygain_track_peak") == 0) {
|
2006-06-21 18:38:18 +02:00
|
|
|
replayGainInfo->trackPeak = atof(value);
|
2006-01-14 23:47:16 +01:00
|
|
|
found = 1;
|
2006-08-23 21:10:47 +02:00
|
|
|
} else if (strcasecmp(key, "replaygain_album_peak") == 0) {
|
2006-06-21 18:38:18 +02:00
|
|
|
replayGainInfo->albumPeak = atof(value);
|
2006-01-14 23:47:16 +01:00
|
|
|
found = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
free(key);
|
|
|
|
free(value);
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (found)
|
|
|
|
return replayGainInfo;
|
2006-06-21 18:38:18 +02:00
|
|
|
freeReplayGainInfo(replayGainInfo);
|
|
|
|
return NULL;
|
2006-01-14 23:47:16 +01:00
|
|
|
}
|
2006-06-21 17:12:41 +02:00
|
|
|
#endif
|
2006-01-14 23:47:16 +01:00
|
|
|
|
2006-06-21 17:12:41 +02:00
|
|
|
#ifdef HAVE_ID3TAG
|
2008-04-12 06:15:10 +02:00
|
|
|
static void mp3_parseId3Tag(mp3DecodeData * data, size_t tagsize,
|
2006-07-20 18:02:40 +02:00
|
|
|
MpdTag ** mpdTag, ReplayGainInfo ** replayGainInfo)
|
|
|
|
{
|
|
|
|
struct id3_tag *id3Tag = NULL;
|
2004-06-01 14:50:15 +02:00
|
|
|
id3_length_t count;
|
|
|
|
id3_byte_t const *id3_data;
|
2006-07-20 18:02:40 +02:00
|
|
|
id3_byte_t *allocated = NULL;
|
|
|
|
MpdTag *tmpMpdTag;
|
|
|
|
ReplayGainInfo *tmpReplayGainInfo;
|
2006-01-14 23:47:16 +01:00
|
|
|
|
2004-06-01 14:50:15 +02:00
|
|
|
count = data->stream.bufend - data->stream.this_frame;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (tagsize <= count) {
|
2004-06-01 14:50:15 +02:00
|
|
|
id3_data = data->stream.this_frame;
|
|
|
|
mad_stream_skip(&(data->stream), tagsize);
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
2006-08-26 08:25:57 +02:00
|
|
|
allocated = xmalloc(tagsize);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!allocated)
|
|
|
|
goto fail;
|
2004-06-01 14:50:15 +02:00
|
|
|
|
|
|
|
memcpy(allocated, data->stream.this_frame, count);
|
|
|
|
mad_stream_skip(&(data->stream), count);
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
while (count < tagsize) {
|
2008-04-12 06:15:10 +02:00
|
|
|
size_t len;
|
2004-06-01 14:50:15 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
len = readFromInputStream(data->inStream,
|
|
|
|
allocated + count, (size_t) 1,
|
|
|
|
tagsize - count);
|
|
|
|
if (len <= 0 && inputStreamAtEOF(data->inStream)) {
|
2004-06-01 14:50:15 +02:00
|
|
|
break;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if (len <= 0)
|
|
|
|
my_usleep(10000);
|
|
|
|
else
|
|
|
|
count += len;
|
2004-06-01 14:50:15 +02:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (count != tagsize) {
|
2004-06-19 23:31:53 +02:00
|
|
|
DEBUG("mp3_decode: error parsing ID3 tag\n");
|
|
|
|
goto fail;
|
|
|
|
}
|
2004-06-01 14:50:15 +02:00
|
|
|
|
|
|
|
id3_data = allocated;
|
|
|
|
}
|
|
|
|
|
|
|
|
id3Tag = id3_tag_parse(id3_data, tagsize);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!id3Tag)
|
|
|
|
goto fail;
|
2006-06-21 18:11:07 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (mpdTag) {
|
2006-06-21 18:22:46 +02:00
|
|
|
tmpMpdTag = parseId3Tag(id3Tag);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (tmpMpdTag) {
|
|
|
|
if (*mpdTag)
|
|
|
|
freeMpdTag(*mpdTag);
|
2006-06-21 18:22:46 +02:00
|
|
|
*mpdTag = tmpMpdTag;
|
2006-06-21 18:11:07 +02:00
|
|
|
}
|
2004-07-24 04:54:19 +02:00
|
|
|
}
|
2004-06-01 14:50:15 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (replayGainInfo) {
|
2006-06-21 18:38:18 +02:00
|
|
|
tmpReplayGainInfo = parseId3ReplayGainInfo(id3Tag);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (tmpReplayGainInfo) {
|
|
|
|
if (*replayGainInfo)
|
|
|
|
freeReplayGainInfo(*replayGainInfo);
|
2006-06-21 18:38:18 +02:00
|
|
|
*replayGainInfo = tmpReplayGainInfo;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-21 18:11:07 +02:00
|
|
|
id3_tag_delete(id3Tag);
|
2006-08-20 12:13:54 +02:00
|
|
|
fail:
|
2006-07-20 18:02:40 +02:00
|
|
|
if (allocated)
|
|
|
|
free(allocated);
|
2004-06-01 14:50:15 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag,
|
|
|
|
ReplayGainInfo ** replayGainInfo)
|
|
|
|
{
|
2006-08-23 15:20:24 +02:00
|
|
|
enum mad_layer layer;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if ((data->stream).buffer == NULL
|
|
|
|
|| (data->stream).error == MAD_ERROR_BUFLEN) {
|
|
|
|
if (fillMp3InputBuffer(data) < 0) {
|
2004-02-24 00:41:20 +01:00
|
|
|
return DECODE_BREAK;
|
|
|
|
}
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
if (mad_header_decode(&data->frame.header, &data->stream)) {
|
2004-03-05 02:29:08 +01:00
|
|
|
#ifdef HAVE_ID3TAG
|
2006-07-20 18:02:40 +02:00
|
|
|
if ((data->stream).error == MAD_ERROR_LOSTSYNC &&
|
|
|
|
(data->stream).this_frame) {
|
|
|
|
signed long tagsize = id3_tag_query((data->stream).
|
|
|
|
this_frame,
|
|
|
|
(data->stream).
|
|
|
|
bufend -
|
|
|
|
(data->stream).
|
|
|
|
this_frame);
|
|
|
|
|
|
|
|
if (tagsize > 0) {
|
|
|
|
if (tag && !(*tag)) {
|
2008-04-12 06:15:10 +02:00
|
|
|
mp3_parseId3Tag(data, (size_t)tagsize,
|
|
|
|
tag, replayGainInfo);
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
2004-06-01 14:50:15 +02:00
|
|
|
mad_stream_skip(&(data->stream),
|
|
|
|
tagsize);
|
|
|
|
}
|
2004-03-05 02:29:08 +01:00
|
|
|
return DECODE_CONT;
|
|
|
|
}
|
|
|
|
}
|
2004-03-05 13:48:57 +01:00
|
|
|
#endif
|
2006-07-20 18:02:40 +02:00
|
|
|
if (MAD_RECOVERABLE((data->stream).error)) {
|
2004-05-18 21:32:05 +02:00
|
|
|
return DECODE_SKIP;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
|
|
|
if ((data->stream).error == MAD_ERROR_BUFLEN)
|
|
|
|
return DECODE_CONT;
|
|
|
|
else {
|
2004-02-24 00:41:20 +01:00
|
|
|
ERROR("unrecoverable frame level error "
|
2006-07-20 18:02:40 +02:00
|
|
|
"(%s).\n",
|
|
|
|
mad_stream_errorstr(&data->stream));
|
2004-02-24 00:41:20 +01:00
|
|
|
data->flush = 0;
|
|
|
|
return DECODE_BREAK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-08-23 15:20:24 +02:00
|
|
|
|
|
|
|
layer = data->frame.header.layer;
|
|
|
|
if (!data->layer) {
|
|
|
|
if (layer != MAD_LAYER_II && layer != MAD_LAYER_III) {
|
|
|
|
/* Only layer 2 and 3 have been tested to work */
|
2006-08-23 16:06:16 +02:00
|
|
|
return DECODE_SKIP;
|
2006-08-23 15:20:24 +02:00
|
|
|
}
|
|
|
|
data->layer = layer;
|
|
|
|
} else if (layer != data->layer) {
|
|
|
|
/* Don't decode frames with a different layer than the first */
|
2004-07-03 16:33:21 +02:00
|
|
|
return DECODE_SKIP;
|
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
return DECODE_OK;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static int decodeNextFrame(mp3DecodeData * data)
|
|
|
|
{
|
|
|
|
if ((data->stream).buffer == NULL
|
|
|
|
|| (data->stream).error == MAD_ERROR_BUFLEN) {
|
|
|
|
if (fillMp3InputBuffer(data) < 0) {
|
2004-02-24 00:41:20 +01:00
|
|
|
return DECODE_BREAK;
|
|
|
|
}
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
if (mad_frame_decode(&data->frame, &data->stream)) {
|
2004-05-06 15:43:09 +02:00
|
|
|
#ifdef HAVE_ID3TAG
|
2006-07-20 18:02:40 +02:00
|
|
|
if ((data->stream).error == MAD_ERROR_LOSTSYNC) {
|
|
|
|
signed long tagsize = id3_tag_query((data->stream).
|
|
|
|
this_frame,
|
|
|
|
(data->stream).
|
|
|
|
bufend -
|
|
|
|
(data->stream).
|
|
|
|
this_frame);
|
|
|
|
if (tagsize > 0) {
|
|
|
|
mad_stream_skip(&(data->stream), tagsize);
|
2004-03-05 02:29:08 +01:00
|
|
|
return DECODE_CONT;
|
|
|
|
}
|
|
|
|
}
|
2004-03-05 13:48:57 +01:00
|
|
|
#endif
|
2006-07-20 18:02:40 +02:00
|
|
|
if (MAD_RECOVERABLE((data->stream).error)) {
|
2004-05-18 21:32:05 +02:00
|
|
|
return DECODE_SKIP;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
|
|
|
if ((data->stream).error == MAD_ERROR_BUFLEN)
|
|
|
|
return DECODE_CONT;
|
|
|
|
else {
|
2004-02-24 00:41:20 +01:00
|
|
|
ERROR("unrecoverable frame level error "
|
2006-07-20 18:02:40 +02:00
|
|
|
"(%s).\n",
|
|
|
|
mad_stream_errorstr(&data->stream));
|
2004-02-24 00:41:20 +01:00
|
|
|
data->flush = 0;
|
|
|
|
return DECODE_BREAK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return DECODE_OK;
|
|
|
|
}
|
|
|
|
|
2006-07-18 20:18:02 +02:00
|
|
|
/* xing stuff stolen from alsaplayer, and heavily modified by jat */
|
2006-05-15 15:48:47 +02:00
|
|
|
#define XI_MAGIC (('X' << 8) | 'i')
|
|
|
|
#define NG_MAGIC (('n' << 8) | 'g')
|
2006-07-18 20:18:02 +02:00
|
|
|
#define IN_MAGIC (('I' << 8) | 'n')
|
|
|
|
#define FO_MAGIC (('f' << 8) | 'o')
|
|
|
|
|
|
|
|
enum xing_magic {
|
2006-07-25 21:08:46 +02:00
|
|
|
XING_MAGIC_XING, /* VBR */
|
2006-08-01 06:18:41 +02:00
|
|
|
XING_MAGIC_INFO /* CBR */
|
2006-07-18 20:18:02 +02:00
|
|
|
};
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
struct xing {
|
2006-07-25 21:08:46 +02:00
|
|
|
long flags; /* valid fields (see below) */
|
|
|
|
unsigned long frames; /* total number of frames */
|
|
|
|
unsigned long bytes; /* total number of bytes */
|
|
|
|
unsigned char toc[100]; /* 100-point seek table */
|
|
|
|
long scale; /* VBR quality */
|
|
|
|
enum xing_magic magic; /* header magic */
|
2004-02-24 00:41:20 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
enum {
|
2006-07-20 18:02:40 +02:00
|
|
|
XING_FRAMES = 0x00000001L,
|
2006-07-25 21:08:46 +02:00
|
|
|
XING_BYTES = 0x00000002L,
|
|
|
|
XING_TOC = 0x00000004L,
|
2006-08-01 06:18:41 +02:00
|
|
|
XING_SCALE = 0x00000008L
|
2004-02-24 00:41:20 +01:00
|
|
|
};
|
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
struct version {
|
2008-01-26 13:46:37 +01:00
|
|
|
unsigned major;
|
|
|
|
unsigned minor;
|
2007-08-22 18:42:08 +02:00
|
|
|
};
|
|
|
|
|
2006-07-26 00:49:10 +02:00
|
|
|
struct lame {
|
2007-08-22 18:42:08 +02:00
|
|
|
char encoder[10]; /* 9 byte encoder name/version ("LAME3.97b") */
|
|
|
|
struct version version; /* struct containing just the version */
|
|
|
|
float peak; /* replaygain peak */
|
|
|
|
float trackGain; /* replaygain track gain */
|
|
|
|
float albumGain; /* replaygain album gain */
|
|
|
|
int encoderDelay; /* # of added samples at start of mp3 */
|
|
|
|
int encoderPadding; /* # of added samples at end of mp3 */
|
|
|
|
int crc; /* CRC of the first 190 bytes of this frame */
|
2006-07-26 00:49:10 +02:00
|
|
|
};
|
|
|
|
|
2006-07-25 22:08:22 +02:00
|
|
|
static int parse_xing(struct xing *xing, struct mad_bitptr *ptr, int *oldbitlen)
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-18 18:28:58 +02:00
|
|
|
unsigned long bits;
|
2006-07-25 22:08:22 +02:00
|
|
|
int bitlen;
|
2006-07-18 20:18:02 +02:00
|
|
|
int bitsleft;
|
|
|
|
int i;
|
|
|
|
|
2006-07-25 22:08:22 +02:00
|
|
|
bitlen = *oldbitlen;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitlen < 16) goto fail;
|
2006-07-18 20:18:02 +02:00
|
|
|
bits = mad_bit_read(ptr, 16);
|
2006-05-15 15:48:47 +02:00
|
|
|
bitlen -= 16;
|
|
|
|
|
2006-07-18 18:28:58 +02:00
|
|
|
if (bits == XI_MAGIC) {
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitlen < 16) goto fail;
|
|
|
|
if (mad_bit_read(ptr, 16) != NG_MAGIC) goto fail;
|
2006-07-18 18:28:58 +02:00
|
|
|
bitlen -= 16;
|
2006-07-18 20:18:02 +02:00
|
|
|
xing->magic = XING_MAGIC_XING;
|
|
|
|
} else if (bits == IN_MAGIC) {
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitlen < 16) goto fail;
|
|
|
|
if (mad_bit_read(ptr, 16) != FO_MAGIC) goto fail;
|
2006-07-18 20:18:02 +02:00
|
|
|
bitlen -= 16;
|
|
|
|
xing->magic = XING_MAGIC_INFO;
|
2006-07-25 21:08:46 +02:00
|
|
|
}
|
|
|
|
else if (bits == NG_MAGIC) xing->magic = XING_MAGIC_XING;
|
|
|
|
else if (bits == FO_MAGIC) xing->magic = XING_MAGIC_INFO;
|
|
|
|
else goto fail;
|
2006-07-18 18:28:58 +02:00
|
|
|
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitlen < 32) goto fail;
|
2006-07-18 20:18:02 +02:00
|
|
|
xing->flags = mad_bit_read(ptr, 32);
|
2006-07-18 18:28:58 +02:00
|
|
|
bitlen -= 32;
|
|
|
|
|
|
|
|
if (xing->flags & XING_FRAMES) {
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitlen < 32) goto fail;
|
2006-07-18 20:18:02 +02:00
|
|
|
xing->frames = mad_bit_read(ptr, 32);
|
2006-07-18 18:28:58 +02:00
|
|
|
bitlen -= 32;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xing->flags & XING_BYTES) {
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitlen < 32) goto fail;
|
2006-07-18 20:18:02 +02:00
|
|
|
xing->bytes = mad_bit_read(ptr, 32);
|
2006-07-18 18:28:58 +02:00
|
|
|
bitlen -= 32;
|
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-18 18:28:58 +02:00
|
|
|
if (xing->flags & XING_TOC) {
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitlen < 800) goto fail;
|
|
|
|
for (i = 0; i < 100; ++i) xing->toc[i] = mad_bit_read(ptr, 8);
|
2006-07-18 18:28:58 +02:00
|
|
|
bitlen -= 800;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xing->flags & XING_SCALE) {
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitlen < 32) goto fail;
|
2006-07-18 20:18:02 +02:00
|
|
|
xing->scale = mad_bit_read(ptr, 32);
|
2006-07-18 18:28:58 +02:00
|
|
|
bitlen -= 32;
|
|
|
|
}
|
|
|
|
|
2006-07-18 20:18:02 +02:00
|
|
|
/* Make sure we consume no less than 120 bytes (960 bits) in hopes that
|
|
|
|
* the LAME tag is found there, and not right after the Xing header */
|
2006-07-25 22:08:22 +02:00
|
|
|
bitsleft = 960 - ((*oldbitlen) - bitlen);
|
2006-07-25 21:08:46 +02:00
|
|
|
if (bitsleft < 0) goto fail;
|
2006-07-18 20:18:02 +02:00
|
|
|
else if (bitsleft > 0) {
|
|
|
|
mad_bit_read(ptr, bitsleft);
|
|
|
|
bitlen -= bitsleft;
|
|
|
|
}
|
|
|
|
|
2006-07-25 22:08:22 +02:00
|
|
|
*oldbitlen = bitlen;
|
2006-07-18 20:18:02 +02:00
|
|
|
|
|
|
|
return 1;
|
2006-08-20 12:13:54 +02:00
|
|
|
fail:
|
2006-07-25 22:08:22 +02:00
|
|
|
xing->flags = 0;
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2006-07-26 00:49:10 +02:00
|
|
|
static int parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
|
|
|
|
{
|
2007-08-22 18:42:08 +02:00
|
|
|
int adj = 0;
|
|
|
|
int name;
|
|
|
|
int orig;
|
|
|
|
int sign;
|
|
|
|
int gain;
|
2006-07-26 00:49:10 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Unlike the xing header, the lame tag has a fixed length. Fail if
|
|
|
|
* not all 36 bytes (288 bits) are there. */
|
2007-08-22 18:42:08 +02:00
|
|
|
if (*bitlen < 288)
|
|
|
|
return 0;
|
2006-07-26 00:49:10 +02:00
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
for (i = 0; i < 9; i++)
|
|
|
|
lame->encoder[i] = (char)mad_bit_read(ptr, 8);
|
2006-07-26 00:49:10 +02:00
|
|
|
lame->encoder[9] = '\0';
|
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
*bitlen -= 72;
|
|
|
|
|
2006-07-26 00:49:10 +02:00
|
|
|
/* This is technically incorrect, since the encoder might not be lame.
|
|
|
|
* But there's no other way to determine if this is a lame tag, and we
|
|
|
|
* wouldn't want to go reading a tag that's not there. */
|
2007-08-22 18:42:08 +02:00
|
|
|
if (strncmp(lame->encoder, "LAME", 4) != 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (sscanf(lame->encoder+4, "%u.%u",
|
|
|
|
&lame->version.major, &lame->version.minor) != 2)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
DEBUG("detected LAME version %i.%i (\"%s\")\n",
|
|
|
|
lame->version.major, lame->version.minor, lame->encoder);
|
|
|
|
|
|
|
|
/* The reference volume was changed from the 83dB used in the
|
|
|
|
* ReplayGain spec to 89dB in lame 3.95.1. Bump the gain for older
|
|
|
|
* versions, since everyone else uses 89dB instead of 83dB.
|
|
|
|
* Unfortunately, lame didn't differentiate between 3.95 and 3.95.1, so
|
|
|
|
* it's impossible to make the proper adjustment for 3.95.
|
|
|
|
* Fortunately, 3.95 was only out for about a day before 3.95.1 was
|
|
|
|
* released. -- tmz */
|
|
|
|
if (lame->version.major < 3 ||
|
|
|
|
(lame->version.major == 3 && lame->version.minor < 95))
|
|
|
|
adj = 6;
|
2006-07-26 00:49:10 +02:00
|
|
|
|
|
|
|
mad_bit_read(ptr, 16);
|
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
lame->peak = mad_f_todouble(mad_bit_read(ptr, 32) << 5); /* peak */
|
|
|
|
DEBUG("LAME peak found: %f\n", lame->peak);
|
|
|
|
|
|
|
|
lame->trackGain = 0;
|
|
|
|
name = mad_bit_read(ptr, 3); /* gain name */
|
|
|
|
orig = mad_bit_read(ptr, 3); /* gain originator */
|
|
|
|
sign = mad_bit_read(ptr, 1); /* sign bit */
|
|
|
|
gain = mad_bit_read(ptr, 9); /* gain*10 */
|
|
|
|
if (gain && name == 1 && orig != 0) {
|
|
|
|
lame->trackGain = ((sign ? -gain : gain) / 10.0) + adj;
|
|
|
|
DEBUG("LAME track gain found: %f\n", lame->trackGain);
|
|
|
|
}
|
2006-07-26 00:49:10 +02:00
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
/* tmz reports that this isn't currently written by any version of lame
|
|
|
|
* (as of 3.97). Since we have no way of testing it, don't use it.
|
|
|
|
* Wouldn't want to go blowing someone's ears just because we read it
|
|
|
|
* wrong. :P -- jat */
|
|
|
|
lame->albumGain = 0;
|
|
|
|
#if 0
|
|
|
|
name = mad_bit_read(ptr, 3); /* gain name */
|
|
|
|
orig = mad_bit_read(ptr, 3); /* gain originator */
|
|
|
|
sign = mad_bit_read(ptr, 1); /* sign bit */
|
|
|
|
gain = mad_bit_read(ptr, 9); /* gain*10 */
|
|
|
|
if (gain && name == 2 && orig != 0) {
|
|
|
|
lame->albumGain = ((sign ? -gain : gain) / 10.0) + adj;
|
|
|
|
DEBUG("LAME album gain found: %f\n", lame->trackGain);
|
|
|
|
}
|
2006-07-26 00:49:10 +02:00
|
|
|
#else
|
2007-08-22 18:42:08 +02:00
|
|
|
mad_bit_read(ptr, 16);
|
2006-07-26 00:49:10 +02:00
|
|
|
#endif
|
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
mad_bit_read(ptr, 16);
|
|
|
|
|
2006-07-26 00:49:10 +02:00
|
|
|
lame->encoderDelay = mad_bit_read(ptr, 12);
|
|
|
|
lame->encoderPadding = mad_bit_read(ptr, 12);
|
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
DEBUG("encoder delay is %i, encoder padding is %i\n",
|
|
|
|
lame->encoderDelay, lame->encoderPadding);
|
2006-07-26 00:49:10 +02:00
|
|
|
|
2007-08-22 18:42:08 +02:00
|
|
|
mad_bit_read(ptr, 80);
|
|
|
|
|
|
|
|
lame->crc = mad_bit_read(ptr, 16);
|
|
|
|
|
|
|
|
*bitlen -= 216;
|
2006-07-26 00:49:10 +02:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,
|
2006-07-25 21:08:46 +02:00
|
|
|
MpdTag ** tag, ReplayGainInfo ** replayGainInfo)
|
2004-06-01 14:50:15 +02:00
|
|
|
{
|
2004-02-24 00:41:20 +01:00
|
|
|
struct xing xing;
|
2006-07-26 00:49:10 +02:00
|
|
|
struct lame lame;
|
2006-07-25 22:08:22 +02:00
|
|
|
struct mad_bitptr ptr;
|
|
|
|
int bitlen;
|
2004-02-24 00:41:20 +01:00
|
|
|
int ret;
|
|
|
|
|
2006-07-26 05:31:21 +02:00
|
|
|
/* stfu gcc */
|
|
|
|
memset(&xing, 0, sizeof(struct xing));
|
|
|
|
xing.flags = 0;
|
2006-07-26 05:28:43 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
while (1) {
|
2006-07-25 21:08:46 +02:00
|
|
|
while ((ret = decodeNextFrameHeader(data, tag, replayGainInfo)) == DECODE_CONT &&
|
|
|
|
(!dc || !dc->stop));
|
2006-08-23 15:43:23 +02:00
|
|
|
if (ret == DECODE_BREAK || (dc && dc->stop)) return -1;
|
|
|
|
if (ret == DECODE_SKIP) continue;
|
2006-07-25 21:08:46 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
while ((ret = decodeNextFrame(data)) == DECODE_CONT &&
|
2006-07-25 21:08:46 +02:00
|
|
|
(!dc || !dc->stop));
|
|
|
|
if (ret == DECODE_BREAK || (dc && dc->stop)) return -1;
|
2006-08-23 15:43:23 +02:00
|
|
|
if (ret == DECODE_OK) break;
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2006-07-25 22:08:22 +02:00
|
|
|
ptr = data->stream.anc_ptr;
|
|
|
|
bitlen = data->stream.anc_bitlen;
|
|
|
|
|
2006-10-03 02:58:20 +02:00
|
|
|
/*
|
|
|
|
* Attempt to calulcate the length of the song from filesize
|
|
|
|
*/
|
2006-10-06 20:01:12 +02:00
|
|
|
{
|
|
|
|
size_t offset = data->inStream->offset;
|
|
|
|
mad_timer_t duration = data->frame.header.duration;
|
|
|
|
float frameTime = ((float)mad_timer_count(duration,
|
|
|
|
MAD_UNITS_MILLISECONDS)) / 1000;
|
|
|
|
|
|
|
|
if (data->stream.this_frame != NULL)
|
|
|
|
offset -= data->stream.bufend - data->stream.this_frame;
|
|
|
|
else
|
|
|
|
offset -= data->stream.bufend - data->stream.buffer;
|
|
|
|
|
|
|
|
if (data->inStream->size >= offset) {
|
|
|
|
data->totalTime = ((data->inStream->size - offset) *
|
|
|
|
8.0) / (data->frame).header.bitrate;
|
|
|
|
data->maxFrames = data->totalTime / frameTime +
|
|
|
|
FRAMES_CUSHION;
|
|
|
|
} else {
|
|
|
|
data->maxFrames = FRAMES_CUSHION;
|
|
|
|
data->totalTime = 0;
|
|
|
|
}
|
2006-10-03 02:58:20 +02:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* if an xing tag exists, use that!
|
|
|
|
*/
|
2006-07-26 05:17:30 +02:00
|
|
|
if (parse_xing(&xing, &ptr, &bitlen)) {
|
2006-08-13 04:53:20 +02:00
|
|
|
data->foundXing = 1;
|
2006-07-26 05:14:19 +02:00
|
|
|
data->muteFrame = MUTEFRAME_SKIP;
|
|
|
|
|
2006-10-03 02:58:20 +02:00
|
|
|
if ((xing.flags & XING_FRAMES) && xing.frames) {
|
2004-02-24 00:41:20 +01:00
|
|
|
mad_timer_t duration = data->frame.header.duration;
|
2006-07-20 18:02:40 +02:00
|
|
|
mad_timer_multiply(&duration, xing.frames);
|
2006-07-25 21:08:46 +02:00
|
|
|
data->totalTime = ((float)mad_timer_count(duration, MAD_UNITS_MILLISECONDS)) / 1000;
|
2004-02-24 00:41:20 +01:00
|
|
|
data->maxFrames = xing.frames;
|
|
|
|
}
|
2007-08-22 18:42:08 +02:00
|
|
|
|
|
|
|
if (parse_lame(&lame, &ptr, &bitlen)) {
|
|
|
|
if (gaplessPlaybackEnabled &&
|
|
|
|
data->inStream->seekable) {
|
|
|
|
data->dropSamplesAtStart = lame.encoderDelay +
|
|
|
|
DECODERDELAY;
|
|
|
|
data->dropSamplesAtEnd = lame.encoderPadding;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Album gain isn't currently used. See comment in
|
|
|
|
* parse_lame() for details. -- jat */
|
|
|
|
if (replayGainInfo && !*replayGainInfo &&
|
|
|
|
lame.trackGain) {
|
|
|
|
*replayGainInfo = newReplayGainInfo();
|
|
|
|
(*replayGainInfo)->trackGain = lame.trackGain;
|
|
|
|
(*replayGainInfo)->trackPeak = lame.peak;
|
|
|
|
}
|
|
|
|
}
|
2006-07-25 21:08:46 +02:00
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-10-03 02:58:20 +02:00
|
|
|
if (!data->maxFrames) return -1;
|
|
|
|
|
2006-08-26 08:25:57 +02:00
|
|
|
data->frameOffset = xmalloc(sizeof(long) * data->maxFrames);
|
|
|
|
data->times = xmalloc(sizeof(mad_timer_t) * data->maxFrames);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static void mp3DecodeDataFinalize(mp3DecodeData * data)
|
|
|
|
{
|
2004-02-24 00:41:20 +01:00
|
|
|
mad_synth_finish(&data->synth);
|
|
|
|
mad_frame_finish(&data->frame);
|
|
|
|
mad_stream_finish(&data->stream);
|
|
|
|
|
2006-07-25 21:08:46 +02:00
|
|
|
if (data->frameOffset) free(data->frameOffset);
|
|
|
|
if (data->times) free(data->times);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* this is primarily used for getting total time for tags */
|
2006-07-20 18:02:40 +02:00
|
|
|
static int getMp3TotalTime(char *file)
|
|
|
|
{
|
|
|
|
InputStream inStream;
|
2004-02-24 00:41:20 +01:00
|
|
|
mp3DecodeData data;
|
|
|
|
int ret;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (openInputStream(&inStream, file) < 0)
|
|
|
|
return -1;
|
|
|
|
initMp3DecodeData(&data, &inStream);
|
|
|
|
if (decodeFirstFrame(&data, NULL, NULL, NULL) < 0)
|
|
|
|
ret = -1;
|
|
|
|
else
|
|
|
|
ret = data.totalTime + 0.5;
|
2004-02-24 00:41:20 +01:00
|
|
|
mp3DecodeDataFinalize(&data);
|
2004-06-03 04:56:26 +02:00
|
|
|
closeInputStream(&inStream);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static int openMp3FromInputStream(InputStream * inStream, mp3DecodeData * data,
|
2006-07-20 18:02:40 +02:00
|
|
|
DecoderControl * dc, MpdTag ** tag,
|
|
|
|
ReplayGainInfo ** replayGainInfo)
|
2004-05-20 00:03:27 +02:00
|
|
|
{
|
2004-05-18 15:13:55 +02:00
|
|
|
initMp3DecodeData(data, inStream);
|
2004-06-01 14:50:15 +02:00
|
|
|
*tag = NULL;
|
2006-07-20 18:02:40 +02:00
|
|
|
if (decodeFirstFrame(data, dc, tag, replayGainInfo) < 0) {
|
2004-02-24 00:41:20 +01:00
|
|
|
mp3DecodeDataFinalize(data);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (tag && *tag)
|
|
|
|
freeMpdTag(*tag);
|
2004-02-24 00:41:20 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
|
|
|
|
ReplayGainInfo ** replayGainInfo)
|
|
|
|
{
|
2006-07-26 05:10:19 +02:00
|
|
|
int samplesPerFrame;
|
|
|
|
int samplesLeft;
|
2004-05-20 06:00:17 +02:00
|
|
|
int i;
|
|
|
|
int ret;
|
|
|
|
int skip;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (data->currentFrame >= data->highestFrame) {
|
|
|
|
mad_timer_add(&data->timer, (data->frame).header.duration);
|
2004-02-24 00:41:20 +01:00
|
|
|
data->bitRate = (data->frame).header.bitrate;
|
2006-07-20 18:02:40 +02:00
|
|
|
if (data->currentFrame >= data->maxFrames) {
|
2004-05-18 16:58:47 +02:00
|
|
|
data->currentFrame = data->maxFrames - 1;
|
2006-08-13 04:53:20 +02:00
|
|
|
} else {
|
2006-07-20 18:02:40 +02:00
|
|
|
data->highestFrame++;
|
2006-08-13 04:53:20 +02:00
|
|
|
}
|
2004-05-18 15:13:55 +02:00
|
|
|
data->frameOffset[data->currentFrame] = data->inStream->offset;
|
2006-07-20 18:02:40 +02:00
|
|
|
if (data->stream.this_frame != NULL) {
|
|
|
|
data->frameOffset[data->currentFrame] -=
|
|
|
|
data->stream.bufend - data->stream.this_frame;
|
|
|
|
} else {
|
|
|
|
data->frameOffset[data->currentFrame] -=
|
|
|
|
data->stream.bufend - data->stream.buffer;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
data->times[data->currentFrame] = data->timer;
|
2006-08-13 04:53:20 +02:00
|
|
|
} else {
|
2006-07-20 18:02:40 +02:00
|
|
|
data->timer = data->times[data->currentFrame];
|
2006-08-13 04:53:20 +02:00
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
data->currentFrame++;
|
2006-07-20 18:02:40 +02:00
|
|
|
data->elapsedTime =
|
|
|
|
((float)mad_timer_count(data->timer, MAD_UNITS_MILLISECONDS)) /
|
|
|
|
1000;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
switch (data->muteFrame) {
|
|
|
|
case MUTEFRAME_SKIP:
|
2004-05-20 06:00:17 +02:00
|
|
|
data->muteFrame = 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
break;
|
|
|
|
case MUTEFRAME_SEEK:
|
|
|
|
if (dc->seekWhere <= data->elapsedTime) {
|
|
|
|
data->outputPtr = data->outputBuffer;
|
|
|
|
clearOutputBuffer(cb);
|
2004-02-24 00:41:20 +01:00
|
|
|
data->muteFrame = 0;
|
|
|
|
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();
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
mad_synth_frame(&data->synth, &data->frame);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-26 05:10:19 +02:00
|
|
|
if (!data->foundFirstFrame) {
|
|
|
|
samplesPerFrame = (data->synth).pcm.length;
|
|
|
|
data->dropFramesAtStart = data->dropSamplesAtStart / samplesPerFrame;
|
|
|
|
data->dropFramesAtEnd = data->dropSamplesAtEnd / samplesPerFrame;
|
|
|
|
data->dropSamplesAtStart = data->dropSamplesAtStart % samplesPerFrame;
|
|
|
|
data->dropSamplesAtEnd = data->dropSamplesAtEnd % samplesPerFrame;
|
|
|
|
data->foundFirstFrame = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->dropFramesAtStart > 0) {
|
|
|
|
data->dropFramesAtStart--;
|
|
|
|
break;
|
|
|
|
} else if ((data->dropFramesAtEnd > 0) &&
|
|
|
|
(data->currentFrame == (data->maxFrames + 1 - data->dropFramesAtEnd))) {
|
2006-12-23 16:22:35 +01:00
|
|
|
/* stop decoding, effectively dropping all remaining
|
|
|
|
* frames */
|
|
|
|
return DECODE_BREAK;
|
2006-07-26 05:10:19 +02:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (data->inStream->metaTitle) {
|
|
|
|
MpdTag *tag = newMpdTag();
|
|
|
|
if (data->inStream->metaName) {
|
2004-11-10 22:58:27 +01:00
|
|
|
addItemToMpdTag(tag,
|
|
|
|
TAG_ITEM_NAME,
|
|
|
|
data->inStream->metaName);
|
2004-06-07 07:00:56 +02:00
|
|
|
}
|
2004-11-10 22:58:27 +01:00
|
|
|
addItemToMpdTag(tag, TAG_ITEM_TITLE,
|
|
|
|
data->inStream->metaTitle);
|
2004-06-07 07:00:56 +02:00
|
|
|
free(data->inStream->metaTitle);
|
|
|
|
data->inStream->metaTitle = NULL;
|
|
|
|
freeMpdTag(tag);
|
|
|
|
}
|
|
|
|
|
2006-07-26 05:10:19 +02:00
|
|
|
samplesLeft = (data->synth).pcm.length;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
for (i = 0; i < (data->synth).pcm.length; i++) {
|
|
|
|
mpd_sint16 *sample;
|
2004-03-20 17:18:47 +01:00
|
|
|
|
2006-12-23 16:10:21 +01:00
|
|
|
samplesLeft--;
|
|
|
|
|
2006-07-26 05:10:19 +02:00
|
|
|
if (!data->decodedFirstFrame &&
|
|
|
|
(i < data->dropSamplesAtStart)) {
|
|
|
|
continue;
|
|
|
|
} else if (data->dropSamplesAtEnd &&
|
2006-12-23 16:10:21 +01:00
|
|
|
(data->currentFrame == (data->maxFrames - data->dropFramesAtEnd)) &&
|
|
|
|
(samplesLeft < data->dropSamplesAtEnd)) {
|
|
|
|
/* stop decoding, effectively dropping
|
|
|
|
* all remaining samples */
|
|
|
|
return DECODE_BREAK;
|
2006-07-26 05:10:19 +02:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
sample = (mpd_sint16 *) data->outputPtr;
|
2004-03-20 17:18:47 +01:00
|
|
|
*sample = (mpd_sint16) audio_linear_dither(16,
|
2006-12-23 16:13:19 +01:00
|
|
|
(data->synth).pcm.samples[0][i],
|
|
|
|
&(data->dither));
|
2006-07-20 18:02:40 +02:00
|
|
|
data->outputPtr += 2;
|
|
|
|
|
|
|
|
if (MAD_NCHANNELS(&(data->frame).header) == 2) {
|
|
|
|
sample = (mpd_sint16 *) data->outputPtr;
|
2004-03-20 17:18:47 +01:00
|
|
|
*sample = (mpd_sint16) audio_linear_dither(16,
|
2006-12-23 16:13:19 +01:00
|
|
|
(data->synth).pcm.samples[1][i],
|
|
|
|
&(data->dither));
|
2006-07-20 18:02:40 +02:00
|
|
|
data->outputPtr += 2;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (data->outputPtr >= data->outputBufferEnd) {
|
|
|
|
ret = sendDataToOutputBuffer(cb,
|
|
|
|
data->inStream,
|
|
|
|
dc,
|
2006-12-23 16:13:19 +01:00
|
|
|
data->inStream->seekable,
|
2006-07-20 18:02:40 +02:00
|
|
|
data->outputBuffer,
|
2006-12-23 16:13:19 +01:00
|
|
|
data->outputPtr - data->outputBuffer,
|
2006-07-20 18:02:40 +02:00
|
|
|
data->elapsedTime,
|
2006-12-23 16:13:19 +01:00
|
|
|
data->bitRate / 1000,
|
|
|
|
(replayGainInfo != NULL) ? *replayGainInfo : NULL);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (ret == OUTPUT_BUFFER_DC_STOP) {
|
2004-06-20 03:37:18 +02:00
|
|
|
data->flush = 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
return DECODE_BREAK;
|
|
|
|
}
|
2004-05-07 21:11:43 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
data->outputPtr = data->outputBuffer;
|
2004-06-20 03:37:18 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (ret == OUTPUT_BUFFER_DC_SEEK)
|
|
|
|
break;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-26 05:10:19 +02:00
|
|
|
data->decodedFirstFrame = 1;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (dc->seek && data->inStream->seekable) {
|
2007-01-14 03:08:16 +01:00
|
|
|
long j = 0;
|
2004-05-20 06:00:17 +02:00
|
|
|
data->muteFrame = MUTEFRAME_SEEK;
|
2007-01-14 03:08:16 +01:00
|
|
|
while (j < data->highestFrame && dc->seekWhere >
|
|
|
|
((float)mad_timer_count(data->times[j],
|
2006-07-20 18:02:40 +02:00
|
|
|
MAD_UNITS_MILLISECONDS))
|
|
|
|
/ 1000) {
|
2007-01-14 03:08:16 +01:00
|
|
|
j++;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
2007-01-14 03:08:16 +01:00
|
|
|
if (j < data->highestFrame) {
|
2006-07-20 18:02:40 +02:00
|
|
|
if (seekMp3InputBuffer(data,
|
2007-01-14 03:08:16 +01:00
|
|
|
data->frameOffset[j]) ==
|
2006-07-20 18:02:40 +02:00
|
|
|
0) {
|
|
|
|
data->outputPtr = data->outputBuffer;
|
|
|
|
clearOutputBuffer(cb);
|
2007-01-14 03:08:16 +01:00
|
|
|
data->currentFrame = j;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else
|
|
|
|
dc->seekError = 1;
|
2004-05-20 06:04:10 +02:00
|
|
|
data->muteFrame = 0;
|
2004-02-24 00:41:20 +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();
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if (dc->seek && !data->inStream->seekable) {
|
|
|
|
dc->seek = 0;
|
|
|
|
dc->seekError = 1;
|
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();
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
while (1) {
|
2004-03-05 14:06:31 +01:00
|
|
|
skip = 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
while ((ret =
|
|
|
|
decodeNextFrameHeader(data, NULL,
|
|
|
|
replayGainInfo)) == DECODE_CONT
|
|
|
|
&& !dc->stop) ;
|
|
|
|
if (ret == DECODE_BREAK || dc->stop || dc->seek)
|
|
|
|
break;
|
|
|
|
else if (ret == DECODE_SKIP)
|
|
|
|
skip = 1;
|
|
|
|
if (!data->muteFrame) {
|
|
|
|
while ((ret = decodeNextFrame(data)) == DECODE_CONT &&
|
|
|
|
!dc->stop && !dc->seek) ;
|
|
|
|
if (ret == DECODE_BREAK || dc->stop || dc->seek)
|
|
|
|
break;
|
2004-03-05 14:06:31 +01:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!skip && ret == DECODE_OK)
|
|
|
|
break;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
2004-03-05 14:06:31 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (dc->stop)
|
|
|
|
return DECODE_BREAK;
|
2004-05-18 22:27:12 +02:00
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static void initAudioFormatFromMp3DecodeData(mp3DecodeData * data,
|
|
|
|
AudioFormat * af)
|
|
|
|
{
|
2004-02-24 00:41:20 +01:00
|
|
|
af->bits = 16;
|
|
|
|
af->sampleRate = (data->frame).header.samplerate;
|
|
|
|
af->channels = MAD_NCHANNELS(&(data->frame).header);
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static int mp3_decode(OutputBuffer * cb, DecoderControl * dc,
|
|
|
|
InputStream * inStream)
|
|
|
|
{
|
2004-02-24 00:41:20 +01:00
|
|
|
mp3DecodeData data;
|
2006-07-20 18:02:40 +02:00
|
|
|
MpdTag *tag = NULL;
|
|
|
|
ReplayGainInfo *replayGainInfo = NULL;
|
2004-02-29 09:10:52 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (openMp3FromInputStream(inStream, &data, dc, &tag, &replayGainInfo) <
|
|
|
|
0) {
|
|
|
|
if (!dc->stop) {
|
|
|
|
ERROR
|
|
|
|
("Input does not appear to be a mp3 bit stream.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 14:35:18 +02:00
|
|
|
initAudioFormatFromMp3DecodeData(&data, &(dc->audioFormat));
|
2006-07-20 18:02:40 +02:00
|
|
|
getOutputAudioFormat(&(dc->audioFormat), &(cb->audioFormat));
|
|
|
|
|
2004-05-10 14:35:18 +02:00
|
|
|
dc->totalTime = data.totalTime;
|
2004-06-01 14:50:15 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (inStream->metaTitle) {
|
|
|
|
if (tag)
|
|
|
|
freeMpdTag(tag);
|
2004-06-07 07:00:56 +02:00
|
|
|
tag = newMpdTag();
|
2004-11-10 22:58:27 +01:00
|
|
|
addItemToMpdTag(tag, TAG_ITEM_TITLE, inStream->metaTitle);
|
2004-06-07 07:00:56 +02:00
|
|
|
free(inStream->metaTitle);
|
|
|
|
inStream->metaTitle = NULL;
|
2006-07-20 18:02:40 +02:00
|
|
|
if (inStream->metaName) {
|
|
|
|
addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName);
|
2004-06-07 07:00:56 +02:00
|
|
|
}
|
|
|
|
freeMpdTag(tag);
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if (tag) {
|
|
|
|
if (inStream->metaName) {
|
2004-11-10 22:58:27 +01:00
|
|
|
clearItemsFromMpdTag(tag, TAG_ITEM_NAME);
|
2006-07-20 18:02:40 +02:00
|
|
|
addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName);
|
2004-06-07 07:00:56 +02:00
|
|
|
}
|
|
|
|
freeMpdTag(tag);
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if (inStream->metaName) {
|
2004-06-07 07:00:56 +02:00
|
|
|
tag = newMpdTag();
|
2006-07-20 18:02:40 +02:00
|
|
|
if (inStream->metaName) {
|
|
|
|
addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName);
|
2004-06-06 18:42:14 +02:00
|
|
|
}
|
2004-06-01 14:50:15 +02:00
|
|
|
freeMpdTag(tag);
|
2004-06-20 03:37:18 +02:00
|
|
|
}
|
2004-06-01 14:50:15 +02:00
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
dc->state = DECODE_STATE_DECODE;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
while (mp3Read(&data, cb, dc, &replayGainInfo) != DECODE_BREAK) ;
|
2004-02-24 00:41:20 +01:00
|
|
|
/* send last little bit if not dc->stop */
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!dc->stop && data.outputPtr != data.outputBuffer && data.flush) {
|
|
|
|
sendDataToOutputBuffer(cb, NULL, dc,
|
|
|
|
data.inStream->seekable,
|
|
|
|
data.outputBuffer,
|
|
|
|
data.outputPtr - data.outputBuffer,
|
|
|
|
data.elapsedTime, data.bitRate / 1000,
|
|
|
|
replayGainInfo);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (replayGainInfo)
|
|
|
|
freeReplayGainInfo(replayGainInfo);
|
2006-01-14 23:47:16 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (dc->seek && data.muteFrame == MUTEFRAME_SEEK) {
|
|
|
|
clearOutputBuffer(cb);
|
|
|
|
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();
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
2004-07-03 16:13:43 +02:00
|
|
|
|
|
|
|
flushOutputBuffer(cb);
|
|
|
|
mp3DecodeDataFinalize(&data);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static MpdTag *mp3_tagDup(char *file)
|
|
|
|
{
|
|
|
|
MpdTag *ret = NULL;
|
2008-01-26 13:46:21 +01:00
|
|
|
int total_time;
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2004-05-31 04:21:06 +02:00
|
|
|
ret = id3Dup(file);
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2008-01-26 13:46:21 +01:00
|
|
|
total_time = getMp3TotalTime(file);
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2008-01-26 13:46:21 +01:00
|
|
|
if (total_time >= 0) {
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!ret)
|
|
|
|
ret = newMpdTag();
|
2008-01-26 13:46:21 +01:00
|
|
|
ret->time = total_time;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
|
|
|
DEBUG("mp3_tagDup: Failed to get total song time from: %s\n",
|
|
|
|
file);
|
2005-09-08 23:08:02 +02:00
|
|
|
}
|
2004-05-31 03:21:17 +02:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-02-05 11:17:33 +01:00
|
|
|
static const char *mp3_suffixes[] = { "mp3", "mp2", NULL };
|
|
|
|
static const char *mp3_mimeTypes[] = { "audio/mpeg", NULL };
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
InputPlugin mp3Plugin = {
|
2004-05-31 03:21:17 +02:00
|
|
|
"mp3",
|
2006-12-23 19:00:15 +01:00
|
|
|
mp3_plugin_init,
|
2004-05-31 22:59:55 +02:00
|
|
|
NULL,
|
2006-03-16 07:52:46 +01:00
|
|
|
NULL,
|
2004-05-31 03:21:17 +02:00
|
|
|
mp3_decode,
|
|
|
|
NULL,
|
|
|
|
mp3_tagDup,
|
|
|
|
INPUT_PLUGIN_STREAM_FILE | INPUT_PLUGIN_STREAM_URL,
|
|
|
|
mp3_suffixes,
|
|
|
|
mp3_mimeTypes
|
|
|
|
};
|
|
|
|
#else
|
|
|
|
|
2007-01-14 04:07:53 +01:00
|
|
|
InputPlugin mp3Plugin;
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2007-04-09 14:24:48 +02:00
|
|
|
#endif /* HAVE_MAD */
|