PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix extRLE16 encoder

Browse Source
This commit is contained in:
MihailRis 2024-09-06 12:08:10 +03:00
parent 4a619fc18e
commit 69b90f53c3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/coders/rle.cpp
View File

@ -158,7 +158,7 @@ size_t extrle::encode16(const ubyte* src8, size_t srclen, ubyte* dst) {
uint16_t c = src[0]; uint16_t c = src[0];
for (size_t i = 1; i < srclen/2; i++) { for (size_t i = 1; i < srclen/2; i++) {
uint16_t cnext = src[i]; uint16_t cnext = src[i];
if (cnext != c || counter == max_sequence) { if (cnext != c || counter == max_sequence16) {
if (counter >= 0x40) { if (counter >= 0x40) {
dst[offset++] = 0x80 | ((c > 255) << 6) | (counter & 0x3F); dst[offset++] = 0x80 | ((c > 255) << 6) | (counter & 0x3F);
dst[offset++] = counter >> 6; dst[offset++] = counter >> 6;

17
test/coders/rle.cpp
View File

@ -5,14 +5,15 @@
static void test_encode_decode( static void test_encode_decode(
size_t(*encodefunc)(const ubyte*, size_t, ubyte*), size_t(*encodefunc)(const ubyte*, size_t, ubyte*),
size_t(*decodefunc)(const ubyte*, size_t, ubyte*) size_t(*decodefunc)(const ubyte*, size_t, ubyte*),
int dencity
) { ) {
const size_t initial_size = 50'000; const size_t initial_size = 50'000;
uint8_t initial[initial_size]; uint8_t initial[initial_size];
uint8_t next = rand(); uint8_t next = rand();
for (size_t i = 0; i < initial_size; i++) { for (size_t i = 0; i < initial_size; i++) {
initial[i] = next; initial[i] = next;
if (rand() % 13 == 0) { if (rand() % dencity == 0) {
next = rand(); next = rand();
} }
} }
@ -29,17 +30,21 @@ static void test_encode_decode(
} }
TEST(RLE, EncodeDecode) { TEST(RLE, EncodeDecode) {
test_encode_decode(rle::encode, rle::decode); test_encode_decode(rle::encode, rle::decode, 13);
test_encode_decode(rle::encode, rle::decode, 90123);
} }
TEST(RLE16, EncodeDecode) { TEST(RLE16, EncodeDecode) {
test_encode_decode(rle::encode16, rle::decode16); test_encode_decode(rle::encode16, rle::decode16, 13);
test_encode_decode(rle::encode16, rle::decode16, 90123);
} }
TEST(ExtRLE, EncodeDecode) { TEST(ExtRLE, EncodeDecode) {
test_encode_decode(extrle::encode, extrle::decode); test_encode_decode(extrle::encode, extrle::decode, 13);
test_encode_decode(extrle::encode, extrle::decode, 90123);
} }
TEST(ExtRLE16, EncodeDecode) { TEST(ExtRLE16, EncodeDecode) {
test_encode_decode(extrle::encode16, extrle::decode16); test_encode_decode(extrle::encode16, extrle::decode16, 13);
test_encode_decode(extrle::encode16, extrle::decode16, 90123);
} }