zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-17 18:01:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check for ID3 tags in MPG123Decoder::open

Browse source
This commit is contained in:
Chris Robinson 2014-06-19 17:19:59 -07:00
parent 77b1febd0e
commit 73d51a4446
2 changed files with 64 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/sound/audio_mpg123_decoder.cpp
View file

@ -69,6 +69,41 @@ bool MPG123Decoder::open(const char *data, size_t length)
inited = true;
}
// Check for ID3 tags and skip them
if(length > 10 && memcmp(data, "ID3", 3) == 0 &&
(BYTE)data[3] <= 4 && (BYTE)data[4] != 0xff &&
(data[5]&0x0f) == 0 && (data[6]&0x80) == 0 &&
(data[7]&0x80) == 0 && (data[8]&0x80) == 0 &&
(data[9]&0x80) == 0)
{
// ID3v2
int start_offset;
start_offset = (data[6]<<21) | (data[7]<<14) |
(data[8]<< 7) | (data[9] );
start_offset += ((data[5]&0x10) ? 20 : 10);
length -= start_offset;
data += start_offset;
}
if(length > 128 && memcmp(data+length-128, "TAG", 3) == 0) // ID3v1
length -= 128;
// Check for a frame header
bool frame_ok = false;
if(length > 3)
{
if((BYTE)data[0] == 0xff &&
((data[1]&0xfe) == 0xfa/*MPEG-1*/ || (data[1]&0xfe) == 0xf2/*MPEG-2*/))
{
int brate_idx = (data[2]>>4) & 0x0f;
int srate_idx = (data[2]>>2) & 0x03;
if(brate_idx != 0 && brate_idx != 15 && srate_idx != 3)
frame_ok = true;
}
}
if(frame_ok)
{
MemData = data;
MemPos = 0;
MemLength = length;
@ -95,6 +130,7 @@ bool MPG123Decoder::open(const char *data, size_t length)
}
mpg123_delete(MPG123);
MPG123 = 0;
}
return false;
}

43
src/sound/i_sound.cpp
View file

@ -525,53 +525,12 @@ SoundDecoder *SoundRenderer::CreateDecoder(const BYTE *sfxdata, int length)
{
SoundDecoder *decoder = NULL;
#ifdef HAVE_MPG123
int mpg_start = -1;
int mpg_len = -1;
// Check for an ID3 tag to identify an mp3 (and skip the tag)
if(length > 10 && memcmp(sfxdata, "ID3", 3) == 0 &&
sfxdata[3] <= 4 && sfxdata[4] != 0xff &&
(sfxdata[5]&0x0f) == 0 && (sfxdata[6]&0x80) == 0 &&
(sfxdata[7]&0x80) == 0 && (sfxdata[8]&0x80) == 0 &&
(sfxdata[9]&0x80) == 0)
{
// ID3v2
mpg_start = (sfxdata[6]<<21) | (sfxdata[7]<<14) |
(sfxdata[8]<< 7) | (sfxdata[9] );
mpg_start += ((sfxdata[5]&0x10) ? 20 : 10);
mpg_len = length - mpg_start;
}
else if(length > 128 && memcmp(sfxdata+length-128, "TAG", 3) == 0)
{
// ID3v1
mpg_start = 0;
mpg_len = length - 128;
}
else if(length > 3)
{
// No ID3 tag. Check for a frame header
if((sfxdata[0] == 0xff && sfxdata[1]>>1 == 0x7d) || // MPEG-1
(sfxdata[0] == 0xff && sfxdata[1]>>1 == 0x79)) // MPEG-2
{
int brate_idx = (sfxdata[2]>>4) & 0x0f;
int srate_idx = (sfxdata[2]>>2) & 0x03;
if(brate_idx != 0 && brate_idx != 15 && srate_idx != 3)
{
mpg_start = 0;
mpg_len = length;
}
}
}
if(mpg_start >= 0 && mpg_len > 0 && mpg_start < length && mpg_len <= length-mpg_start)
{
decoder = new MPG123Decoder;
if(!decoder->open((const char*)sfxdata+mpg_start, mpg_len))
if(!decoder->open((const char*)sfxdata, length))
{
delete decoder;
decoder = NULL;
}
}
#endif
#ifdef HAVE_SNDFILE
if(!decoder)