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

If a frame header decode loses sync, just try again instead of trying to decode a frame (which will automatically decode the next header without allowing us to do some checks on it).

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

10
src/inputPlugins/mp3_plugin.c
View File

@ -629,25 +629,21 @@ static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,
struct mad_bitptr ptr; struct mad_bitptr ptr;
int bitlen; int bitlen;
int ret; int ret;
int skip;
/* stfu gcc */ /* stfu gcc */
memset(&xing, 0, sizeof(struct xing)); memset(&xing, 0, sizeof(struct xing));
xing.flags = 0; xing.flags = 0;
while (1) { while (1) {
skip = 0;
while ((ret = decodeNextFrameHeader(data, tag, replayGainInfo)) == DECODE_CONT && while ((ret = decodeNextFrameHeader(data, tag, replayGainInfo)) == DECODE_CONT &&
(!dc || !dc->stop)); (!dc || !dc->stop));
if (ret == DECODE_BREAK || (dc && dc->stop)) return -1;
if (ret == DECODE_SKIP) skip = 1; if (ret == DECODE_SKIP) continue;
else if (ret == DECODE_BREAK || (dc && dc->stop)) return -1;
while ((ret = decodeNextFrame(data)) == DECODE_CONT && while ((ret = decodeNextFrame(data)) == DECODE_CONT &&
(!dc || !dc->stop)); (!dc || !dc->stop));
if (ret == DECODE_BREAK || (dc && dc->stop)) return -1; if (ret == DECODE_BREAK || (dc && dc->stop)) return -1;
if (!skip && ret == DECODE_OK) break; if (ret == DECODE_OK) break;
} }
ptr = data->stream.anc_ptr; ptr = data->stream.anc_ptr;