mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 16:47:28 +01:00
std/brotli: fix the Zopfli starting distance cache order
Also run the encoder parity harness at qualities up to 11, using the workbuf_len minimum.
This commit is contained in:
3 files changed
+12
-4
No files matched your search
@@ -98854,6 +98854,7 @@ wuffs_brotli__encoder__compute_distance_cache(
|
|||||||
wuffs_base__slice_u8 a_wb,
|
wuffs_base__slice_u8 a_wb,
|
||||||
uint64_t a_pos) {
|
uint64_t a_pos) {
|
||||||
uint32_t v_idx = 0;
|
uint32_t v_idx = 0;
|
||||||
|
uint32_t v_sdc = 0;
|
||||||
uint64_t v_p = 0;
|
uint64_t v_p = 0;
|
||||||
uint64_t v_i_len = 0;
|
uint64_t v_i_len = 0;
|
||||||
uint64_t v_c_len = 0;
|
uint64_t v_c_len = 0;
|
||||||
@@ -98867,9 +98868,11 @@ wuffs_brotli__encoder__compute_distance_cache(
|
|||||||
v_idx += 1u;
|
v_idx += 1u;
|
||||||
v_p = ((uint64_t)(wuffs_brotli__encoder__zn_u(self, a_wb, ((uint64_t)(((uint64_t)(v_p - v_c_len)) - v_i_len)))));
|
v_p = ((uint64_t)(wuffs_brotli__encoder__zn_u(self, a_wb, ((uint64_t)(((uint64_t)(v_p - v_c_len)) - v_i_len)))));
|
||||||
}
|
}
|
||||||
|
v_sdc = 0u;
|
||||||
while (v_idx < 4u) {
|
while (v_idx < 4u) {
|
||||||
self->private_data.f_zp_dc[v_idx] = self->private_impl.f_dist_cache[v_idx];
|
self->private_data.f_zp_dc[v_idx] = self->private_impl.f_dist_cache[(v_sdc & 3u)];
|
||||||
v_idx += 1u;
|
v_idx += 1u;
|
||||||
|
v_sdc += 1u;
|
||||||
}
|
}
|
||||||
return wuffs_base__make_empty_struct();
|
return wuffs_base__make_empty_struct();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -278,7 +278,9 @@ encode_wuffs(const config* c, size_t* have_len) {
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
uint64_t wlen = wuffs_brotli__encoder__workbuf_len(enc).max_incl;
|
// Use the minimum, so that the qualities 10 and 11 practical bound is
|
||||||
|
// exercised (at other qualities, min_incl == max_incl).
|
||||||
|
uint64_t wlen = wuffs_brotli__encoder__workbuf_len(enc).min_incl;
|
||||||
if (wlen > ((uint64_t)1 << 32)) {
|
if (wlen > ((uint64_t)1 << 32)) {
|
||||||
ret = "workbuf_len is too large";
|
ret = "workbuf_len is too large";
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
@@ -741,7 +743,7 @@ main(int argc, char** argv) {
|
|||||||
unsigned b = 0;
|
unsigned b = 0;
|
||||||
if (sscanf(argv[argi], "-q=%u-%u", &a, &b) == 2) {
|
if (sscanf(argv[argi], "-q=%u-%u", &a, &b) == 2) {
|
||||||
g_qmin = a;
|
g_qmin = a;
|
||||||
g_qmax = (b < 9) ? b : 9;
|
g_qmax = (b < 11) ? b : 11;
|
||||||
} else if (sscanf(argv[argi], "-shard=%u/%u", &a, &b) == 2) {
|
} else if (sscanf(argv[argi], "-shard=%u/%u", &a, &b) == 2) {
|
||||||
shard_k = (int)a;
|
shard_k = (int)a;
|
||||||
shard_n = (b > 0) ? (int)b : 1;
|
shard_n = (b > 0) ? (int)b : 1;
|
||||||
|
|||||||
@@ -521,6 +521,7 @@ pri func encoder.compute_distance_shortcut(wb: roslice base.u8, block_start: bas
|
|||||||
// zp_dc field. The starting distance cache is this.dist_cache.
|
// zp_dc field. The starting distance cache is this.dist_cache.
|
||||||
pri func encoder.compute_distance_cache!(wb: roslice base.u8, pos: base.u64) {
|
pri func encoder.compute_distance_cache!(wb: roslice base.u8, pos: base.u64) {
|
||||||
var idx : base.u32
|
var idx : base.u32
|
||||||
|
var sdc : base.u32
|
||||||
var p : base.u64
|
var p : base.u64
|
||||||
var i_len : base.u64
|
var i_len : base.u64
|
||||||
var c_len : base.u64
|
var c_len : base.u64
|
||||||
@@ -535,9 +536,11 @@ pri func encoder.compute_distance_cache!(wb: roslice base.u8, pos: base.u64) {
|
|||||||
// Because of prerequisite, p >= c_len + i_len >= 2.
|
// Because of prerequisite, p >= c_len + i_len >= 2.
|
||||||
p = this.zn_u(wb: args.wb, i: (p ~mod- c_len) ~mod- i_len) as base.u64
|
p = this.zn_u(wb: args.wb, i: (p ~mod- c_len) ~mod- i_len) as base.u64
|
||||||
}
|
}
|
||||||
|
sdc = 0
|
||||||
while idx < 4 {
|
while idx < 4 {
|
||||||
this.zp_dc[idx] = this.dist_cache[idx]
|
this.zp_dc[idx] = this.dist_cache[sdc & 3]
|
||||||
idx ~mod+= 1
|
idx ~mod+= 1
|
||||||
|
sdc ~mod+= 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user