Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MPG123] Update to version 1.25.12. CORE-16440

Browse source
This commit is contained in:
Thomas Faber 2019-10-20 12:19:51 +02:00
parent 983f57b6e0
commit e02cdcce68
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
6 changed files with 54 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
sdk/lib/3rdparty/libmpg123/id3.c vendored
View file

@ -884,7 +884,8 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes)
int rva_mode = -1; /* mix / album */
unsigned long realsize = framesize;
unsigned char* realdata = tagdata+pos;
if((flags & UNSYNC_FLAG) || (fflags & UNSYNC_FFLAG))
unsigned char* unsyncbuffer = NULL;
if(((flags & UNSYNC_FLAG) || (fflags & UNSYNC_FFLAG)) && framesize > 0)
{
unsigned long ipos = 0;
unsigned long opos = 0;
@ -892,7 +893,7 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes)
/* de-unsync: FF00 -> FF; real FF00 is simply represented as FF0000 ... */
/* damn, that means I have to delete bytes from withing the data block... thus need temporal storage */
/* standard mandates that de-unsync should always be safe if flag is set */
realdata = (unsigned char*) malloc(framesize); /* will need <= bytes */
realdata = unsyncbuffer = malloc(framesize+1); /* will need <= bytes, plus a safety zero */
if(realdata == NULL)
{
if(NOQUIET) error("ID3v2: unable to allocate working buffer for de-unsync");
@ -909,6 +910,8 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes)
}
}
realsize = opos;
/* Append a zero to keep strlen() safe. */
realdata[realsize] = 0;
debug2("ID3v2: de-unsync made %lu out of %lu bytes", realsize, framesize);
}
pos = 0; /* now at the beginning again... */
@ -936,14 +939,24 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes)
if(fr->rva.level[rva_mode] <= rva2+1)
{
pos += strlen((char*) realdata) + 1;
if(realdata[pos] == 1)
// channel and two bytes for RVA value
// pos possibly just past the safety zero, so one more than realsize
if(pos > realsize || realsize-pos < 3)
{
if(NOQUIET)
error("bad RVA2 tag (truncated?)");
}
else if(realdata[pos] == 1)
{
++pos;
/* only handle master channel */
debug("ID3v2: it is for the master channel");
/* two bytes adjustment, one byte for bits representing peak - n bytes, eh bits, for peak */
/* 16 bit signed integer = dB * 512 ... the double cast is needed to preserve the sign of negative values! */
fr->rva.gain[rva_mode] = (float) ( (((short)((signed char)realdata[pos])) << 8) | realdata[pos+1] ) / 512;
/* 16 bit signed integer = dB * 512. Do not shift signed integers! Multiply instead.
Also no implementation-defined casting. Reinterpret the pointer to signed char, then do
proper casting. */
fr->rva.gain[rva_mode] = (float) (
((short)((signed char*)realdata)[pos]) * 256 + (short)realdata[pos+1] ) / 512;
pos += 2;
if(VERBOSE3) fprintf(stderr, "Note: RVA value %fdB\n", fr->rva.gain[rva_mode]);
/* heh, the peak value is represented by a number of bits - but in what manner? Skipping that part */
@ -964,7 +977,8 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes)
break;
default: if(NOQUIET) error1("ID3v2: unknown frame type %i", tt);
}
if((flags & UNSYNC_FLAG) || (fflags & UNSYNC_FFLAG)) free(realdata);
if(unsyncbuffer)
free(unsyncbuffer);
}
#undef BAD_FFLAGS
#undef PRES_TAG_FFLAG