Apple-2gs-SW/gsla
1
0
Fork 0
mirror of https://github.com/dwsJason/gsla.git synced 2024-11-21 21:31:39 +00:00
Code Issues Projects Releases Wiki Activity

These compressors are "good enough"

Browse Source
This commit is contained in:
JASON-6700K\jandersen 2020-07-17 14:33:32 -04:00
parent f80008ca21
commit 3a7b5a69fb
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/lzb.cpp
View File

@ -59,7 +59,9 @@ int LZB_Compress(unsigned char* pDest, unsigned char* pSource, int sourceSize)
{ {
candidateData = LongestMatch(sourceData, dictionaryData); candidateData = LongestMatch(sourceData, dictionaryData);
if (0 == candidateData.size) // If no match, or the match is too small, then take the next byte
// and emit as literal
if ((0 == candidateData.size)) // || (candidateData.size < 4))
{ {
candidateData.size = 1; candidateData.size = 1;
candidateData.pData = sourceData.pData; candidateData.pData = sourceData.pData;
@ -161,7 +163,22 @@ int Old_LZB_Compress(unsigned char* pDest, unsigned char* pSource, int sourceSiz
} }
else else
{ {
candidate_data.size++; if (0 == candidate_data.size)
{
candidate_data.size++;
}
else
{
processedBytes--;
//if (candidate_data.size > 1)
//{
// processedBytes -= (candidate_data.size - 1);
// candidate_data.size = 1;
//}
}
// Add Dictionary // Add Dictionary
bytesInDictionary = AddDictionary(candidate_data, bytesInDictionary); bytesInDictionary = AddDictionary(candidate_data, bytesInDictionary);
@ -177,6 +194,7 @@ int Old_LZB_Compress(unsigned char* pDest, unsigned char* pSource, int sourceSiz
bytesEmitted += EmitLiteral(pDest + bytesEmitted, candidate_data); bytesEmitted += EmitLiteral(pDest + bytesEmitted, candidate_data);
} }
bLastEmitIsLiteral = true; bLastEmitIsLiteral = true;
//MatchOffset = -1;
} }
} }
} }
@ -518,7 +536,7 @@ void LZB_Decompress(unsigned char* pDest, unsigned char* pSource, int destSize)
u16 opcode = *pSource++; u16 opcode = *pSource++;
opcode |= ((u16)(*pSource++))<<8; opcode |= ((u16)(*pSource++))<<8;
//printf("%04X:", (unsigned int)(pSource-pOriginalSource)); // printf("%04X:", (unsigned int)(pSource-pOriginalSource));
if (opcode & 0x8000) if (opcode & 0x8000)
@ -541,7 +559,7 @@ void LZB_Decompress(unsigned char* pDest, unsigned char* pSource, int destSize)
decompressedBytes += opcode; decompressedBytes += opcode;
//printf("%04X:Dic %04X %s\n",decompressedBytes, (unsigned int)opcode, overlapped); // printf("%04X:Dic %04X %s\n",decompressedBytes, (unsigned int)opcode, overlapped);
} }
else else
{ {
@ -550,7 +568,7 @@ void LZB_Decompress(unsigned char* pDest, unsigned char* pSource, int destSize)
decompressedBytes += opcode; decompressedBytes += opcode;
pSource += opcode; pSource += opcode;
//printf("%04X:Lit %04X\n",decompressedBytes, (unsigned int)opcode); // printf("%04X:Lit %04X\n",decompressedBytes, (unsigned int)opcode);
} }
} }
} }

20
source/main.cpp
View File

@ -113,6 +113,25 @@ int main(int argc, char* argv[])
const std::vector<unsigned char*>& c1Datas = c2data.GetPixelMaps(); const std::vector<unsigned char*>& c1Datas = c2data.GetPixelMaps();
#if 1
unsigned char workbuffer[64*1024];
for (int idx = 0; idx < frameCount; ++idx)
{
int compressedSize = LZB_Compress(workbuffer, c1Datas[ idx ], 32 * 1024);
printf("compressedSize = %d\n", compressedSize);
unsigned char validationBuffer[ 32 * 1024 ];
LZB_Decompress(validationBuffer, workbuffer, 32 * 1024);
if (0 == memcmp(c1Datas[ idx ], validationBuffer, 32*1024))
{
printf("Decompression Validated\n");
}
else
{
printf("Decompression Corrupted\n");
}
}
#else
unsigned char workbuffer[64*1024]; unsigned char workbuffer[64*1024];
unsigned char workbuffer2[64*1024]; unsigned char workbuffer2[64*1024];
@ -140,6 +159,7 @@ int main(int argc, char* argv[])
} }
} }
#endif
} }
} }