mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

More sawyercoding optimisations

This commit is contained in:
Michał Janiszewski 2016-05-14 11:54:19 +02:00
parent 9cd762b1a6
commit 90bcca11d2
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/util/sawyercoding.c
View File

@ -322,7 +322,7 @@ static size_t decode_chunk_rle(const uint8* src_buffer, uint8* dst_buffer, size_
*/
static size_t decode_chunk_repeat(uint8 *buffer, size_t length)
{
size_t i, j, count;
size_t i, count;
uint8 *src, *dst, *copyOffset;
// Backup buffer
@ -336,8 +336,8 @@ static size_t decode_chunk_repeat(uint8 *buffer, size_t length)
} else {
count = (src[i] & 7) + 1;
copyOffset = dst + (int)(src[i] >> 3) - 32;
for (j = 0; j < count; j++)
*dst++ = *copyOffset++;
memcpy(dst, copyOffset, count);
dst = (uint8*)((uintptr_t)dst + count);
}
}
@ -382,9 +382,10 @@ static size_t encode_chunk_rle(const uint8 *src_buffer, uint8 *dst_buffer, size_
if ((count && *src == src[1]) || count > 125){
*dst++ = count - 1;
for (; count != 0; --count){
*dst++ = *src_norm_start++;
}
memcpy(dst, src_norm_start, count);
dst += count;
src_norm_start += count;
count = 0;
}
if (*src == src[1]){
for (; (count < 125) && ((src + count) < end_src); count++){
@ -404,9 +405,10 @@ static size_t encode_chunk_rle(const uint8 *src_buffer, uint8 *dst_buffer, size_
if (src == end_src - 1)count++;
if (count){
*dst++ = count - 1;
for (; count != 0; --count){
*dst++ = *src_norm_start++;
}
memcpy(dst, src_norm_start, count);
dst += count;
src_norm_start += count;
count = 0;
}
return dst - dst_buffer;
}
@ -429,16 +431,17 @@ static size_t encode_chunk_repeat(const uint8 *src_buffer, uint8 *dst_buffer, si
// Iterate through remainder of the source buffer
for (i = 1; i < length; ) {
searchIndex = max(0, i - 32);
searchIndex = (i < 32) ? 0 : (i - 32);
searchEnd = i - 1;
bestRepeatCount = 0;
for (repeatIndex = searchIndex; repeatIndex <= searchEnd; repeatIndex++) {
repeatCount = 0;
maxRepeatCount = min(min(7, searchEnd - repeatIndex), length - i - 1);
// maxRepeatCount should not exceed length
assert(repeatIndex + maxRepeatCount < length);
assert(i + maxRepeatCount < length);
for (j = 0; j <= maxRepeatCount; j++) {
assert(repeatIndex + j < length);
assert(i + j < length);
if (src_buffer[repeatIndex + j] == src_buffer[i + j]) {
repeatCount++;
} else {