AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 04:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement fixed/static huffman tables

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-30 16:09:53 +10:00
parent 3d230bc356
commit fa7d6d6b20
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Client/Deflate.c
View File

@ -189,7 +189,7 @@ while (state->NumBits < bitsCount) {\
#define DEFLATE_NEXTBLOCK_STATE(state) state->State = state->LastBlock ? DeflateState_Done : DeflateState_Header;
/* TODO: This is probably completely broken. just tryna get something. */
/* TODO: This needs to be massively optimised. */
void Huffman_Build(HuffmanTable* table, UInt8* bitLens, Int32 count) {
Int32 i;
table->FirstCodewords[0] = 0;
@ -288,10 +288,27 @@ bool Deflate_Step(DeflateState* state) {
state->State = DeflateState_UncompressedHeader;
} break;
case 1: { /* TODO: Compressed with FIXED huffman table*/
case 1: { /* Fixed/static huffman compressed */
UInt8 fixed_lits[DEFLATE_MAX_LITS] = {
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8
};
UInt8 fixed_dists[DEFLATE_MAX_DISTS] = {
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
};
Huffman_Build(&state->LitsTable, fixed_lits, DEFLATE_MAX_LITS);
Huffman_Build(&state->DistsTable, fixed_dists, DEFLATE_MAX_DISTS);
state->State = DeflateState_CompressedData;
} break;
case 2: { /* TODO: Compressed with dynamic huffman table */
case 2: /* Dynamic huffman compressed */ {
state->State = DeflateState_DynamicHeader;
} break;
case 3:
@ -338,7 +355,7 @@ bool Deflate_Step(DeflateState* state) {
} break;
case DeflateState_DynamicCodeLens: {
UInt8 order[DEFLATE_MAX_CODELENS] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
UInt8 order[DEFLATE_MAX_CODELENS] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
Int32 i;
while (state->Index < state->NumCodeLens) {
@ -377,11 +394,13 @@ bool Deflate_Step(DeflateState* state) {
}
repeatCount += 3; repeatValue = state->Buffer[state->Index - 1];
break;
case 17:
DEFLATE_ENSURE_BITS(state, 3);
DEFLATE_CONSUME_BITS(state, 3, repeatCount);
repeatCount += 3; repeatValue = 0;
break;
case 18:
DEFLATE_ENSURE_BITS(state, 7);
DEFLATE_CONSUME_BITS(state, 7, repeatCount);

9
src/Client/Deflate.h
View File

@ -2,8 +2,13 @@
#define CS_DEFLATE_H
#include "Typedefs.h"
#include "Stream.h"
/* Decodes data compressed using DEFLATE.
Copyright 2017 ClassicalSharp | Licensed under BSD-3
/* Decodes data compressed using DEFLATE in a streaming manner.
Based off information from
https://handmade.network/forums/wip/t/2363-implementing_a_basic_png_reader_the_handmade_way
http://commandlinefanatic.com/cgi-bin/showarticle.cgi?article=art001
https://www.ietf.org/rfc/rfc1951.txt
https://github.com/nothings/stb/blob/master/stb_image.h
Copyright 2017 ClassicalSharp | Licensed under BSD-3
*/
typedef struct GZipHeader_ {