0x5eal/rbxts-pako
1
0
Fork 0
mirror of https://github.com/0x5eal/rbxts-pako.git synced 2025-04-04 10:50:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Tweaked trees init

Browse source
This commit is contained in:
Vitaly Puzrin 2014-02-19 06:11:09 +04:00
parent 99c8fa83b5
commit 1a64fa47f5
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/zlib/deflate.js
View file

@ -1006,14 +1006,6 @@ function lm_init(s) {
}
var TreeDesc = function() {
// TODO: null or [] ? Check speed
this.dyn_tree = null; /* the dynamic tree */
this.max_code = 0; /* largest code with non zero frequency */
this.stat_desc = null; /* the corresponding static tree */
};
function DeflateState() {
this.strm = null; /* pointer back to this zlib stream */
this.status = 0; /* as the name implies */
@ -1136,9 +1128,9 @@ function DeflateState() {
// Seems to init better from `tree` with direct structures,
// (?) with separate constructor for bl_desc or not?
// Make sure objects have the same hidden class if needed
this.l_desc = new TreeDesc(); /* desc. for literal tree */
this.d_desc = new TreeDesc(); /* desc. for distance tree */
this.bl_desc = new TreeDesc(); /* desc. for bit length tree */
this.l_desc = null; /* desc. for literal tree */
this.d_desc = null; /* desc. for distance tree */
this.bl_desc = null; /* desc. for bit length tree */
//ush bl_count[MAX_BITS+1];
this.bl_count = [];

31
lib/zlib/trees.js
View file

@ -129,6 +129,9 @@ var StaticTreeDesc = function (static_tree, extra_bits, extra_base, elems, max_l
this.extra_base = extra_base; /* base index for extra_bits */
this.elems = elems; /* max number of elements in the tree */
this.max_length = max_length; /* max bit length for the codes */
// show if `static_tree` has data or dummy - needed for monomorphic objects
this.has_stree = static_tree && static_tree.length;
};
@ -137,6 +140,15 @@ var static_d_desc;
var static_bl_desc;
var TreeDesc = function(dyn_tree, stat_desc) {
// TODO: null or [] ? Check speed
this.dyn_tree = dyn_tree; /* the dynamic tree */
this.max_code = 0; /* largest code with non zero frequency */
this.stat_desc = stat_desc; /* the corresponding static tree */
};
function d_code(dist) {
return dist < 256 ? _dist_code[dist] : _dist_code[256 + (dist >>> 7)];
}
@ -209,6 +221,7 @@ function gen_bitlen(s, desc)
var tree = desc.dyn_tree;
var max_code = desc.max_code;
var stree = desc.stat_desc.static_tree;
var has_stree = desc.stat_desc.has_stree;
var extra = desc.stat_desc.extra_bits;
var base = desc.stat_desc.extra_base;
var max_length = desc.stat_desc.max_length;
@ -247,7 +260,7 @@ function gen_bitlen(s, desc)
}
f = tree[n * 2]/*.Freq*/;
s.opt_len += f * (bits + xbits);
if (stree) {
if (has_stree) {
s.static_len += f * (stree[n*2 + 1]/*.Len*/ + xbits);
}
}
@ -434,7 +447,7 @@ function tr_static_init() {
// TODO: we could pass empty array instead of null in original
// BUT (!) at first check, that it will not break condition in build_tree()
// static_bl_desc =new StaticTreeDesc([], extra_blbits, 0, BL_CODES, MAX_BL_BITS);
static_bl_desc =new StaticTreeDesc(null, extra_blbits, 0, BL_CODES, MAX_BL_BITS);
static_bl_desc =new StaticTreeDesc([], extra_blbits, 0, BL_CODES, MAX_BL_BITS);
//static_init_done = true;
}
@ -613,6 +626,7 @@ function build_tree(s, desc)
{
var tree = desc.dyn_tree;
var stree = desc.stat_desc.static_tree;
var has_stree = desc.stat_desc.has_stree;
var elems = desc.stat_desc.elems;
var n, m; /* iterate over heap elements */
var max_code = -1; /* largest code with non zero frequency */
@ -647,7 +661,7 @@ function build_tree(s, desc)
s.opt_len--;
// TODO: check this condition!
// see init of `static_bl_desc`, we like set empty array instead of null
if (stree) {
if (has_stree) {
// if (stree.length) {
s.static_len -= stree[node*2 + 1]/*.Len*/;
}
@ -964,14 +978,9 @@ function _tr_init(s)
}
// TODO: check that this does not affect speed (we could recreate the class)
s.l_desc.dyn_tree = s.dyn_ltree;
s.l_desc.stat_desc = static_l_desc;
s.d_desc.dyn_tree = s.dyn_dtree;
s.d_desc.stat_desc = static_d_desc;
s.bl_desc.dyn_tree = s.bl_tree;
s.bl_desc.stat_desc = static_bl_desc;
s.l_desc = new TreeDesc(s.dyn_ltree, static_l_desc);
s.d_desc = new TreeDesc(s.dyn_dtree, static_d_desc);
s.bl_desc = new TreeDesc(s.bl_tree, static_bl_desc);
s.bi_buf = 0;
s.bi_valid = 0;