oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Skip layer 2 frames in mp3s and vice versa. Also drop support for layer 1, since it hasn't been tested.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4669 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2006-08-23 13:20:24 +00:00
parent 67de7ea116
commit 103dd654f0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/inputPlugins/mp3_plugin.c
View File

@ -145,6 +145,7 @@ typedef struct _mp3DecodeData {
unsigned long bitRate; unsigned long bitRate;
InputStream *inStream; InputStream *inStream;
struct audio_dither dither; struct audio_dither dither;
enum mad_layer layer;
} mp3DecodeData; } mp3DecodeData;
static void initMp3DecodeData(mp3DecodeData * data, InputStream * inStream) static void initMp3DecodeData(mp3DecodeData * data, InputStream * inStream)
@ -167,6 +168,7 @@ static void initMp3DecodeData(mp3DecodeData * data, InputStream * inStream)
data->decodedFirstFrame = 0; data->decodedFirstFrame = 0;
data->flush = 1; data->flush = 1;
data->inStream = inStream; data->inStream = inStream;
data->layer = 0;
memset(&(data->dither), 0, sizeof(struct audio_dither)); memset(&(data->dither), 0, sizeof(struct audio_dither));
mad_stream_init(&data->stream); mad_stream_init(&data->stream);
@ -352,6 +354,8 @@ fail:
static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag, static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag,
ReplayGainInfo ** replayGainInfo) ReplayGainInfo ** replayGainInfo)
{ {
enum mad_layer layer;
if ((data->stream).buffer == NULL if ((data->stream).buffer == NULL
|| (data->stream).error == MAD_ERROR_BUFLEN) { || (data->stream).error == MAD_ERROR_BUFLEN) {
if (fillMp3InputBuffer(data) < 0) { if (fillMp3InputBuffer(data) < 0) {
@ -395,9 +399,17 @@ static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag,
} }
} }
} }
if ((data->frame.header.layer != MAD_LAYER_III) &&
(data->frame.header.layer != MAD_LAYER_II) && layer = data->frame.header.layer;
(data->frame.header.layer != MAD_LAYER_I)) { if (!data->layer) {
if (layer != MAD_LAYER_II && layer != MAD_LAYER_III) {
/* Only layer 2 and 3 have been tested to work */
DEBUG("MPEG audio file is not layer 2 or 3\n");
return DECODE_BREAK;
}
data->layer = layer;
} else if (layer != data->layer) {
/* Don't decode frames with a different layer than the first */
return DECODE_SKIP; return DECODE_SKIP;
} }