zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "lzpf: updated function flow path"

Browse Source 
This reverts commit 02c92b8527.
This commit is contained in:
zefie
2021-08-08 17:26:33 -04:00
parent c81279310b
commit 00d0d59f07
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
zefie_wtvp_minisrv/WTVLzpf.js
View File

@@ -22,6 +22,7 @@ class WTVLzpf {
checksum = 0; checksum = 0;
flag_table = new Uint16Array(0x1000) flag_table = new Uint16Array(0x1000)
ring_buffer = new Uint8Array(0x2000) ring_buffer = new Uint8Array(0x2000)
encoded_data = [];
nomatchEncode = [ nomatchEncode = [
[0x0000, 0x10], [0x0001, 0x10], [0x0002, 0x10], [0x0000, 0x10], [0x0001, 0x10], [0x0002, 0x10],
@@ -289,6 +290,7 @@ class WTVLzpf {
this.checksum = 0; this.checksum = 0;
this.ring_buffer.fill(0x00, 0, 0x2000) this.ring_buffer.fill(0x00, 0, 0x2000)
this.flag_table.fill(0xFFFF, 0, 0x1000); this.flag_table.fill(0xFFFF, 0, 0x1000);
this.encoded_data = [];
} }
/** /**
@@ -298,9 +300,8 @@ class WTVLzpf {
* *
* @returns {undefined} * @returns {undefined}
*/ */
AddByte(byte, encoded_data) { AddByte(byte) {
encoded_data.push(byte); this.encoded_data.push(byte);
return encoded_data;
} }
/** /**
@@ -311,19 +312,18 @@ class WTVLzpf {
* *
* @returns {undefined} * @returns {undefined}
*/ */
EncodeLiteral(code_length, code, encoded_data) { EncodeLiteral(code_length, code) {
// Using >>> to stick with unsigned integers without making a mess with casting. // Using >>> to stick with unsigned integers without making a mess with casting.
this.current_literal |= code >>> (this.current_length & 0x1F); this.current_literal |= code >>> (this.current_length & 0x1F);
this.current_length += code_length; this.current_length += code_length;
while (this.current_length > 7) { while (this.current_length > 7) {
encoded_data = this.AddByte((this.current_literal >>> 0x18) & 0xFF, encoded_data); this.AddByte((this.current_literal >>> 0x18) & 0xFF);
this.current_length -= 8; this.current_length -= 8;
this.current_literal = (this.current_literal << 8) & 0xFFFFFFFF; this.current_literal = (this.current_literal << 8) & 0xFFFFFFFF;
} }
return encoded_data;
} }
/** /**
@@ -343,7 +343,8 @@ class WTVLzpf {
* *
* @returns {Buffer} Lzpf encoded data * @returns {Buffer} Lzpf encoded data
*/ */
EncodeBlock(unencoded_data, compress_data, encoded_data = []) { EncodeBlock(unencoded_data, compress_data) {
this.encoded_data = [];
var uncompressed_len = unencoded_data.byteLength; var uncompressed_len = unencoded_data.byteLength;
var i = 0; var i = 0;
@@ -397,11 +398,11 @@ class WTVLzpf {
} }
if (code_length > 0) { if (code_length > 0) {
encoded_data = this.EncodeLiteral(code_length, code, encoded_data); this.EncodeLiteral(code_length, code);
} }
} }
return encoded_data; return Buffer.from(this.encoded_data);
} }
/** /**
@@ -411,38 +412,37 @@ class WTVLzpf {
* *
* @returns {Buffer} Lzpf compression data * @returns {Buffer} Lzpf compression data
*/ */
Finish(encoded_data) { Finish() {
var code_length = -1 var code_length = -1
var code = -1 var code = -1
if (this.type_index == 2) { if (this.type_index == 2) {
encoded_data = this.EncodeLiteral(0x10, 0x00990000, encoded_data); this.EncodeLiteral(0x10, 0x00990000);
} else if (this.type_index >= 3) { } else if (this.type_index >= 3) {
if (this.type_index == 4) { if (this.type_index == 4) {
code_length = this.matchEncode[this.match_index][1]; code_length = this.matchEncode[this.match_index][1];
code = this.matchEncode[this.match_index][0]; code = this.matchEncode[this.match_index][0];
encoded_data = this.EncodeLiteral(code_length, code, encoded_data); this.EncodeLiteral(code_length, code);
} }
var flags_index = (this.working_data >>> 0x0B ^ this.working_data) & 0x0FFF; var flags_index = (this.working_data >>> 0x0B ^ this.working_data) & 0x0FFF;
var flag = this.flag_table[flags_index]; var flag = this.flag_table[flags_index];
if (flag == 0xFFFF) { if (flag == 0xFFFF) {
encoded_data = this.EncodeLiteral(0x10, 0x00990000, encoded_data); this.EncodeLiteral(0x10, 0x00990000);
} else { } else {
encoded_data = this.EncodeLiteral(0x11, 0x004c8000, encoded_data); this.EncodeLiteral(0x11, 0x004c8000);
} }
} }
// Below is just metadata. The compressed block is complete. // Below is just metadata. The compressed block is complete.
// Encode checksum // Encode checksum
encoded_data = this.EncodeLiteral(0x08, (this.checksum << 0x10) & 0xFFFFFFFF, encoded_data); this.EncodeLiteral(0x08, (this.checksum << 0x10) & 0xFFFFFFFF);
encoded_data = this.EncodeLiteral(0x08, (this.checksum << 0x18) & 0xFFFFFFFF, encoded_data); this.EncodeLiteral(0x08, (this.checksum << 0x18) & 0xFFFFFFFF);
// End // End
encoded_data = this.AddByte((this.current_literal >>> 0x18) & 0xFF, encoded_data); this.AddByte((this.current_literal >>> 0x18) & 0xFF);
encoded_data = this.AddByte(0x20, encoded_data); this.AddByte(0x20);
return encoded_data;
} }
/** /**
@@ -475,10 +475,10 @@ class WTVLzpf {
Compress(uncompressed_data) { Compress(uncompressed_data) {
uncompressed_data = this.ConvertToBuffer(uncompressed_data); uncompressed_data = this.ConvertToBuffer(uncompressed_data);
this.Begin(); this.Begin();
var compressed_data = this.EncodeBlock(uncompressed_data, true); this.EncodeBlock(uncompressed_data, true);
compressed_data = this.Finish(compressed_data); this.Finish();
return Buffer.from(compressed_data); return Buffer.from(this.encoded_data);
} }
} }