If a frame header decode loses sync, just try again instead of trying to decode…

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). git-svn-id: https://svn.musicpd.org/mpd/trunk@4670 09075e82-0dd4-0310-85a5-a0d7c8717e4f

If a frame header decode loses sync, just try again instead of trying to decode…
30bf8f89 · J. Alexander Treuman · 103dd654 · 30bf8f89
Commit 30bf8f89 authored Aug 23, 2006 by J. Alexander Treuman
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

mp3_plugin.c src/inputPlugins/mp3_plugin.c +3 -7

No files found.
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -629,25 +629,21 @@ static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,
 	struct mad_bitptr ptr;
 	int bitlen;
 	int ret;
-	int skip;

 	/* stfu gcc */
 	memset(&xing, 0, sizeof(struct xing));
 	xing.flags = 0;

 	while (1) {
-		skip = 0;
 		while ((ret = decodeNextFrameHeader(data, tag, replayGainInfo)) == DECODE_CONT &&
 		       (!dc || !dc->stop));
-
-		if (ret == DECODE_SKIP) skip = 1;
-		else if (ret == DECODE_BREAK || (dc && dc->stop)) return -1;
+		if (ret == DECODE_BREAK || (dc && dc->stop)) return -1;
+		if (ret == DECODE_SKIP) continue;

 		while ((ret = decodeNextFrame(data)) == DECODE_CONT &&
 		       (!dc || !dc->stop));
-
 		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;