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

Reindenting parse_xing, since I need to work on it and it's a mess

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4397 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2006-07-18 16:28:58 +00:00
parent e6b0d82c2e
commit e7566b9643
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/inputPlugins/mp3_plugin.c
View File

@ -423,53 +423,52 @@ enum {
static int parse_xing(struct xing *xing, struct mad_bitptr ptr, unsigned int bitlen)
{
unsigned long bits;
unsigned long bits;
if (bitlen < 16) goto fail;
bits = mad_bit_read(&ptr, 16);
if (bitlen < 16) goto fail;
bits = mad_bit_read(&ptr, 16);
bitlen -= 16;
if (bits == XI_MAGIC) {
if (bitlen < 16) goto fail;
if (mad_bit_read(&ptr, 16) != NG_MAGIC) goto fail;
bitlen -= 16;
}
else if (bits != NG_MAGIC) goto fail;
if (bits == XI_MAGIC) {
if (bitlen < 16) goto fail;
if (mad_bit_read(&ptr, 16) != NG_MAGIC) goto fail;
bitlen -= 16;
}
else if (bits != NG_MAGIC) goto fail;
if (bitlen < 32) goto fail;
xing->flags = mad_bit_read(&ptr, 32);
bitlen -= 32;
if (bitlen < 32) goto fail;
xing->flags = mad_bit_read(&ptr, 32);
bitlen -= 32;
if (xing->flags & XING_FRAMES) {
if (bitlen < 32) goto fail;
xing->frames = mad_bit_read(&ptr, 32);
bitlen -= 32;
}
if (xing->flags & XING_FRAMES) {
if (bitlen < 32) goto fail;
xing->frames = mad_bit_read(&ptr, 32);
bitlen -= 32;
}
if (xing->flags & XING_BYTES) {
if (bitlen < 32) goto fail;
xing->bytes = mad_bit_read(&ptr, 32);
bitlen -= 32;
}
if (xing->flags & XING_BYTES) {
if (bitlen < 32) goto fail;
xing->bytes = mad_bit_read(&ptr, 32);
bitlen -= 32;
}
if (xing->flags & XING_TOC) {
int i;
if (bitlen < 800) goto fail;
for (i = 0; i < 100; ++i) xing->toc[i] = mad_bit_read(&ptr, 8);
bitlen -= 800;
}
if (xing->flags & XING_TOC) {
int i;
if (bitlen < 800) goto fail;
for (i = 0; i < 100; ++i) xing->toc[i] = mad_bit_read(&ptr, 8);
bitlen -= 800;
}
if (xing->flags & XING_SCALE) {
if (bitlen < 32) goto fail;
xing->scale = mad_bit_read(&ptr, 32);
bitlen -= 32;
}
return 1;
if (xing->flags & XING_SCALE) {
if (bitlen < 32) goto fail;
xing->scale = mad_bit_read(&ptr, 32);
bitlen -= 32;
}
return 1;
fail:
xing->flags = 0;
return 0;
xing->flags = 0;
return 0;
}
static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,