Azahar-Mirror/soundtouch
1
0
Fork 0
mirror of https://github.com/azahar-emu/soundtouch synced 2025-11-07 07:30:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed 'long' types to 'int's

Browse Source
This commit is contained in:
oparviai 2012-08-23 20:36:28 +00:00
parent f7ad193e4d
commit 31b9e8f98a
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source/SoundStretch/WavFile.cpp
View File

@ -84,7 +84,7 @@ static const char dataStr[] = "data";
// big-endian CPU, swap bytes in 16 & 32 bit words // big-endian CPU, swap bytes in 16 & 32 bit words
// helper-function to swap byte-order of 32bit integer // helper-function to swap byte-order of 32bit integer
static inline long _swap32(long &dwData) static inline int _swap32(int &dwData)
{ {
dwData = ((dwData >> 24) & 0x000000FF) | dwData = ((dwData >> 24) & 0x000000FF) |
((dwData >> 8) & 0x0000FF00) | ((dwData >> 8) & 0x0000FF00) |
@ -116,7 +116,7 @@ static const char dataStr[] = "data";
// little-endian CPU, WAV file is ok as such // little-endian CPU, WAV file is ok as such
// dummy helper-function // dummy helper-function
static inline long _swap32(long &dwData) static inline int _swap32(int &dwData)
{ {
// do nothing // do nothing
return dwData; return dwData;
@ -384,7 +384,7 @@ int WavInFile::read(float *buffer, int maxElems)
// read raw data into temporary buffer // read raw data into temporary buffer
char *temp = (char*)getConvBuffer(numBytes); char *temp = (char*)getConvBuffer(numBytes);
numBytes = fread(temp, 1, numBytes, fptr); numBytes = (int)fread(temp, 1, numBytes, fptr);
dataRead += numBytes; dataRead += numBytes;
numElems = numBytes / bytesPerSample; numElems = numBytes / bytesPerSample;
@ -421,7 +421,7 @@ int WavInFile::read(float *buffer, int maxElems)
double conv = 1.0 / 8388608; double conv = 1.0 / 8388608;
for (int i = 0; i < numElems; i ++) for (int i = 0; i < numElems; i ++)
{ {
long value = *((long*)temp2); int value = *((int*)temp2);
value = _swap32(value) & 0x00ffffff; // take 24 bits value = _swap32(value) & 0x00ffffff; // take 24 bits
value |= (value & 0x00800000) ? 0xff000000 : 0; // extend minus sign bits value |= (value & 0x00800000) ? 0xff000000 : 0; // extend minus sign bits
buffer[i] = (float)(value * conv); buffer[i] = (float)(value * conv);
@ -432,12 +432,12 @@ int WavInFile::read(float *buffer, int maxElems)
case 4: case 4:
{ {
long *temp2 = (long *)temp; int *temp2 = (int *)temp;
double conv = 1.0 / 2147483648; double conv = 1.0 / 2147483648;
assert(sizeof(long) == 4); assert(sizeof(int) == 4);
for (int i = 0; i < numElems; i ++) for (int i = 0; i < numElems; i ++)
{ {
long value = temp2[i]; int value = temp2[i];
buffer[i] = (float)(_swap32(value) * conv); buffer[i] = (float)(_swap32(value) * conv);
} }
break; break;
@ -485,7 +485,7 @@ int WavInFile::readRIFFBlock()
if (fread(&(header.riff), sizeof(WavRiff), 1, fptr) != 1) return -1; if (fread(&(header.riff), sizeof(WavRiff), 1, fptr) != 1) return -1;
// swap 32bit data byte order if necessary // swap 32bit data byte order if necessary
_swap32((long &)header.riff.package_len); _swap32((int &)header.riff.package_len);
// header.riff.riff_char should equal to 'RIFF'); // header.riff.riff_char should equal to 'RIFF');
if (memcmp(riffStr, header.riff.riff_char, 4) != 0) return -1; if (memcmp(riffStr, header.riff.riff_char, 4) != 0) return -1;
@ -512,7 +512,7 @@ int WavInFile::readHeaderBlock()
// Decode blocks according to their label // Decode blocks according to their label
if (strcmp(label, fmtStr) == 0) if (strcmp(label, fmtStr) == 0)
{ {
long nLen, nDump; int nLen, nDump;
// 'fmt ' block // 'fmt ' block
memcpy(header.format.fmt, fmtStr, 4); memcpy(header.format.fmt, fmtStr, 4);
@ -538,8 +538,8 @@ int WavInFile::readHeaderBlock()
// swap byte order if necessary // swap byte order if necessary
_swap16(header.format.fixed); // short int fixed; _swap16(header.format.fixed); // short int fixed;
_swap16(header.format.channel_number); // short int channel_number; _swap16(header.format.channel_number); // short int channel_number;
_swap32((long &)header.format.sample_rate); // int sample_rate; _swap32((int &)header.format.sample_rate); // int sample_rate;
_swap32((long &)header.format.byte_rate); // int byte_rate; _swap32((int &)header.format.byte_rate); // int byte_rate;
_swap16(header.format.byte_per_sample); // short int byte_per_sample; _swap16(header.format.byte_per_sample); // short int byte_per_sample;
_swap16(header.format.bits_per_sample); // short int bits_per_sample; _swap16(header.format.bits_per_sample); // short int bits_per_sample;
@ -558,7 +558,7 @@ int WavInFile::readHeaderBlock()
if (fread(&(header.data.data_len), sizeof(uint), 1, fptr) != 1) return -1; if (fread(&(header.data.data_len), sizeof(uint), 1, fptr) != 1) return -1;
// swap byte order if necessary // swap byte order if necessary
_swap32((long &)header.data.data_len); _swap32((int &)header.data.data_len);
return 1; return 1;
} }
@ -752,15 +752,15 @@ void WavOutFile::writeHeader()
// swap byte order if necessary // swap byte order if necessary
hdrTemp = header; hdrTemp = header;
_swap32((long &)hdrTemp.riff.package_len); _swap32((int &)hdrTemp.riff.package_len);
_swap32((long &)hdrTemp.format.format_len); _swap32((int &)hdrTemp.format.format_len);
_swap16((short &)hdrTemp.format.fixed); _swap16((short &)hdrTemp.format.fixed);
_swap16((short &)hdrTemp.format.channel_number); _swap16((short &)hdrTemp.format.channel_number);
_swap32((long &)hdrTemp.format.sample_rate); _swap32((int &)hdrTemp.format.sample_rate);
_swap32((long &)hdrTemp.format.byte_rate); _swap32((int &)hdrTemp.format.byte_rate);
_swap16((short &)hdrTemp.format.byte_per_sample); _swap16((short &)hdrTemp.format.byte_per_sample);
_swap16((short &)hdrTemp.format.bits_per_sample); _swap16((short &)hdrTemp.format.bits_per_sample);
_swap32((long &)hdrTemp.data.data_len); _swap32((int &)hdrTemp.data.data_len);
// write the supplemented header in the beginning of the file // write the supplemented header in the beginning of the file
fseek(fptr, 0, SEEK_SET); fseek(fptr, 0, SEEK_SET);
@ -849,7 +849,7 @@ void WavOutFile::write(const short *buffer, int numElems)
/// Convert from float to integer and saturate /// Convert from float to integer and saturate
inline long saturate(float fvalue, float minval, float maxval) inline int saturate(float fvalue, float minval, float maxval)
{ {
if (fvalue > maxval) if (fvalue > maxval)
{ {
@ -859,7 +859,7 @@ inline long saturate(float fvalue, float minval, float maxval)
{ {
fvalue = minval; fvalue = minval;
} }
return (long)fvalue; return (int)fvalue;
} }
@ -902,8 +902,8 @@ void WavOutFile::write(const float *buffer, int numElems)
char *temp2 = (char *)temp; char *temp2 = (char *)temp;
for (int i = 0; i < numElems; i ++) for (int i = 0; i < numElems; i ++)
{ {
long value = saturate(buffer[i] * 8388608.0f, -8388608.0f, 8388607.0f); int value = saturate(buffer[i] * 8388608.0f, -8388608.0f, 8388607.0f);
*((long*)temp2) = _swap32(value); *((int*)temp2) = _swap32(value);
temp2 += 3; temp2 += 3;
} }
break; break;
@ -911,10 +911,10 @@ void WavOutFile::write(const float *buffer, int numElems)
case 4: case 4:
{ {
long *temp2 = (long *)temp; int *temp2 = (int *)temp;
for (int i = 0; i < numElems; i ++) for (int i = 0; i < numElems; i ++)
{ {
long value = saturate(buffer[i] * 2147483648.0f, -2147483648.0f, 2147483647.0f); int value = saturate(buffer[i] * 2147483648.0f, -2147483648.0f, 2147483647.0f);
temp2[i] = _swap32(value); temp2[i] = _swap32(value);
} }
break; break;
@ -924,7 +924,7 @@ void WavOutFile::write(const float *buffer, int numElems)
assert(false); assert(false);
} }
int res = fwrite(temp, 1, numBytes, fptr); int res = (int)fwrite(temp, 1, numBytes, fptr);
if (res != numBytes) if (res != numBytes)
{ {