chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fix for endian issues in the CRC calculations in the MAC framework.

Browse source
This commit is contained in:
vspader 2007-03-05 00:33:00 +00:00
parent 58989af1f2
commit 5b40f598e1
2 changed files with 102 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Frameworks/MAC/MAC.xcodeproj/project.pbxproj
View file

@ -507,6 +507,7 @@
GCC_PREFIX_HEADER = MAC_Prefix.pch; GCC_PREFIX_HEADER = MAC_Prefix.pch;
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks"; INSTALL_PATH = "@loader_path/../Frameworks";
PER_ARCH_CFLAGS_ppc = "-maltivec";
PRODUCT_NAME = MAC; PRODUCT_NAME = MAC;
USER_HEADER_SEARCH_PATHS = "mac-src"; USER_HEADER_SEARCH_PATHS = "mac-src";
WRAPPER_EXTENSION = framework; WRAPPER_EXTENSION = framework;

123
Frameworks/MAC/mac-src/src/MACLib/Prepare.cpp
View file

@ -69,7 +69,17 @@ int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORM
for (int nBlockIndex = 0; nBlockIndex < nTotalBlocks; nBlockIndex++) for (int nBlockIndex = 0; nBlockIndex < nTotalBlocks; nBlockIndex++)
{ {
uint32 nTemp = 0; uint32 nTemp = 0;
#if (__BYTE_ORDER == __BIG_ENDIAN)
nTemp |= (*(pRawData+2) << 0);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+2)];
nTemp |= (*(pRawData+1) << 8);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+1)];
nTemp |= (*pRawData << 16);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData];
pRawData += 3;
#else
nTemp |= (*pRawData << 0); nTemp |= (*pRawData << 0);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
@ -78,14 +88,24 @@ int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORM
nTemp |= (*pRawData << 16); nTemp |= (*pRawData << 16);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
#endif
if (nTemp & 0x800000) if (nTemp & 0x800000)
R = (int) (nTemp & 0x7FFFFF) - 0x800000; R = (int) (nTemp & 0x7FFFFF) - 0x800000;
else else
R = (int) (nTemp & 0x7FFFFF); R = (int) (nTemp & 0x7FFFFF);
nTemp = 0; nTemp = 0;
#if (__BYTE_ORDER == __BIG_ENDIAN)
nTemp |= (*(pRawData+2) << 0);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+2)];
nTemp |= (*(pRawData+1) << 8);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+1)];
nTemp |= (*pRawData << 16);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData];
pRawData += 3;
#else
nTemp |= (*pRawData << 0); nTemp |= (*pRawData << 0);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
@ -94,14 +114,12 @@ int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORM
nTemp |= (*pRawData << 16); nTemp |= (*pRawData << 16);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
#endif
if (nTemp & 0x800000) if (nTemp & 0x800000)
L = (int) (nTemp & 0x7FFFFF) - 0x800000; L = (int) (nTemp & 0x7FFFFF) - 0x800000;
else else
L = (int) (nTemp & 0x7FFFFF); L = (int) (nTemp & 0x7FFFFF);
// check the peak // check the peak
if (labs(L) > *pPeakLevel) if (labs(L) > *pPeakLevel)
*pPeakLevel = labs(L); *pPeakLevel = labs(L);
@ -119,7 +137,17 @@ int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORM
for (int nBlockIndex = 0; nBlockIndex < nTotalBlocks; nBlockIndex++) for (int nBlockIndex = 0; nBlockIndex < nTotalBlocks; nBlockIndex++)
{ {
uint32 nTemp = 0; uint32 nTemp = 0;
#if (__BYTE_ORDER == __BIG_ENDIAN)
nTemp |= (*(pRawData+2) << 0);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+2)];
nTemp |= (*(pRawData+1) << 8);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+1)];
nTemp |= (*pRawData << 16);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData];
pRawData += 3;
#else
nTemp |= (*pRawData << 0); nTemp |= (*pRawData << 0);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
@ -128,7 +156,7 @@ int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORM
nTemp |= (*pRawData << 16); nTemp |= (*pRawData << 16);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
#endif
if (nTemp & 0x800000) if (nTemp & 0x800000)
R = (int) (nTemp & 0x7FFFFF) - 0x800000; R = (int) (nTemp & 0x7FFFFF) - 0x800000;
else else
@ -152,7 +180,17 @@ int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORM
int nBlockIndex = 0; int nBlockIndex = 0;
for (nBlockIndex = 0; nBlockIndex < nTotalBlocks; nBlockIndex++) for (nBlockIndex = 0; nBlockIndex < nTotalBlocks; nBlockIndex++)
{ {
#if (__BYTE_ORDER == __BIG_ENDIAN)
R = (int) *((int16 *) pRawData);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+1)];
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData];
pRawData += 2;
L = (int) *((int16 *) pRawData);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+1)];
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData];
pRawData += 2;
#else
R = (int) *((int16 *) pRawData); R = (int) *((int16 *) pRawData);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
@ -160,10 +198,7 @@ int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORM
L = (int) *((int16 *) pRawData); L = (int) *((int16 *) pRawData);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
#endif
R = swap_int16(R);
L = swap_int16(L);
// check the peak // check the peak
if (labs(L) > LPeak) if (labs(L) > LPeak)
LPeak = labs(L); LPeak = labs(L);
@ -199,13 +234,17 @@ int CPrepare::Prepare(const unsigned char * pRawData, int nBytes, const WAVEFORM
int nPeak = 0; int nPeak = 0;
for (int nBlockIndex = 0; nBlockIndex < nTotalBlocks; nBlockIndex++) for (int nBlockIndex = 0; nBlockIndex < nTotalBlocks; nBlockIndex++)
{ {
#if (__BYTE_ORDER == __BIG_ENDIAN)
R = (int) *((int16 *) pRawData);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *(pRawData+1)];
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData];
pRawData += 2;
#else
R = (int) *((int16 *) pRawData); R = (int) *((int16 *) pRawData);
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++]; CRC = (CRC >> 8) ^ CRC32_TABLE[(CRC & 0xFF) ^ *pRawData++];
#endif
R = swap_int16(R);
// check the peak // check the peak
if (labs(R) > nPeak) if (labs(R) > nPeak)
nPeak = labs(R); nPeak = labs(R);
@ -254,16 +293,24 @@ void CPrepare::Unprepare(int X, int Y, const WAVEFORMATEX * pWaveFormatEx, unsig
{ {
throw(-1); throw(-1);
} }
#if (__BYTE_ORDER == __BIG_ENDIAN)
// *(int16 *) pOutput = (int16) nR; *(int16 *) pOutput = (int16) nR;
*(int16 *) pOutput = swap_int16(nR); *pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+1)];
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *pOutput];
pOutput+=2;
*(int16 *) pOutput = (int16) nL;
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+1)];
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *pOutput];
pOutput+=2;
#else
*(int16 *) pOutput = (int16) nR;
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
// *(int16 *) pOutput = (int16) nL; *(int16 *) pOutput = (int16) nL;
* (int16 *) pOutput = swap_int16(nL);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
#endif
} }
else if (pWaveFormatEx->wBitsPerSample == 8) else if (pWaveFormatEx->wBitsPerSample == 8)
{ {
@ -285,20 +332,36 @@ void CPrepare::Unprepare(int X, int Y, const WAVEFORMATEX * pWaveFormatEx, unsig
nTemp = ((uint32) (RV + 0x800000)) | 0x800000; nTemp = ((uint32) (RV + 0x800000)) | 0x800000;
else else
nTemp = (uint32) RV; nTemp = (uint32) RV;
#if (__BYTE_ORDER == __BIG_ENDIAN)
*(pOutput+2) = (unsigned char) ((nTemp >> 0) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+2)];
*(pOutput+1) = (unsigned char) ((nTemp >> 8) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+1)];
*pOutput = (unsigned char) ((nTemp >> 16) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *pOutput];
pOutput += 3;
#else
*pOutput = (unsigned char) ((nTemp >> 0) & 0xFF); *pOutput = (unsigned char) ((nTemp >> 0) & 0xFF);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
*pOutput = (unsigned char) ((nTemp >> 8) & 0xFF); *pOutput = (unsigned char) ((nTemp >> 8) & 0xFF);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
*pOutput = (unsigned char) ((nTemp >> 16) & 0xFF); *pOutput = (unsigned char) ((nTemp >> 16) & 0xFF);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
#endif
nTemp = 0; nTemp = 0;
if (LV < 0) if (LV < 0)
nTemp = ((uint32) (LV + 0x800000)) | 0x800000; nTemp = ((uint32) (LV + 0x800000)) | 0x800000;
else else
nTemp = (uint32) LV; nTemp = (uint32) LV;
#if (__BYTE_ORDER == __BIG_ENDIAN)
*(pOutput+2) = (unsigned char) ((nTemp >> 0) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+2)];
*(pOutput+1) = (unsigned char) ((nTemp >> 8) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+1)];
*pOutput = (unsigned char) ((nTemp >> 16) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *pOutput];
pOutput += 3;
#else
*pOutput = (unsigned char) ((nTemp >> 0) & 0xFF); *pOutput = (unsigned char) ((nTemp >> 0) & 0xFF);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
@ -307,6 +370,7 @@ void CPrepare::Unprepare(int X, int Y, const WAVEFORMATEX * pWaveFormatEx, unsig
*pOutput = (unsigned char) ((nTemp >> 16) & 0xFF); *pOutput = (unsigned char) ((nTemp >> 16) & 0xFF);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
#endif
} }
} }
else if (pWaveFormatEx->nChannels == 1) else if (pWaveFormatEx->nChannels == 1)
@ -314,10 +378,16 @@ void CPrepare::Unprepare(int X, int Y, const WAVEFORMATEX * pWaveFormatEx, unsig
if (pWaveFormatEx->wBitsPerSample == 16) if (pWaveFormatEx->wBitsPerSample == 16)
{ {
int16 R = X; int16 R = X;
#if (__BYTE_ORDER == __BIG_ENDIAN)
*(int16 *) pOutput = (int16) R;
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+1)];
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *pOutput];
pOutput+=2;
#else
*(int16 *) pOutput = (int16) R; *(int16 *) pOutput = (int16) R;
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
#endif
} }
else if (pWaveFormatEx->wBitsPerSample == 8) else if (pWaveFormatEx->wBitsPerSample == 8)
{ {
@ -334,13 +404,22 @@ void CPrepare::Unprepare(int X, int Y, const WAVEFORMATEX * pWaveFormatEx, unsig
nTemp = ((uint32) (RV + 0x800000)) | 0x800000; nTemp = ((uint32) (RV + 0x800000)) | 0x800000;
else else
nTemp = (uint32) RV; nTemp = (uint32) RV;
#if (__BYTE_ORDER == __BIG_ENDIAN)
*(pOutput+2) = (unsigned char) ((nTemp >> 0) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+2)];
*(pOutput+1) = (unsigned char) ((nTemp >> 8) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *(pOutput+1)];
*pOutput = (unsigned char) ((nTemp >> 16) & 0xFF);
*pCRC = (*pCRC >> 8) ^ CRC32_TABLE[(*pCRC & 0xFF) ^ *pOutput];
pOutput += 3;
#else
*pOutput = (unsigned char) ((nTemp >> 0) & 0xFF); *pOutput = (unsigned char) ((nTemp >> 0) & 0xFF);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
*pOutput = (unsigned char) ((nTemp >> 8) & 0xFF); *pOutput = (unsigned char) ((nTemp >> 8) & 0xFF);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
*pOutput = (unsigned char) ((nTemp >> 16) & 0xFF); *pOutput = (unsigned char) ((nTemp >> 16) & 0xFF);
CALCULATE_CRC_BYTE CALCULATE_CRC_BYTE
#endif
} }
} }
} }