mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
std/jpeg: tweak "this.mcu_zig_index" vs "var z"
This commit is contained in:
1 parent
9b97c27ec6
commit
e4902dbd45
3 files changed
+24
-42
No files matched your search
@@ -41692,9 +41692,11 @@ wuffs_jpeg__decoder__decode_mcu__choosy_default(
|
||||
v_ret = 1u;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
v_z = 1u;
|
||||
self->private_impl.f_mcu_zig_index = 0u;
|
||||
v_ac_h = self->private_impl.f_mcu_blocks_ac_hselector[self->private_impl.f_mcu_current_block];
|
||||
v_ac_huff_table_fast = &self->private_impl.f_huff_tables_fast[v_ac_h][0u];
|
||||
while (true) {
|
||||
while (v_z < 64u) {
|
||||
if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
|
||||
v_ret = 2u;
|
||||
goto label__goto_done__break;
|
||||
@@ -41738,22 +41740,15 @@ wuffs_jpeg__decoder__decode_mcu__choosy_default(
|
||||
v_ac_value += (v_ac_extend & (((uint32_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 4294967295u));
|
||||
v_bits <<= v_ac_ssss;
|
||||
v_n_bits -= v_ac_ssss;
|
||||
v_z = (self->private_impl.f_mcu_zig_index + v_ac_rrrr + 1u);
|
||||
v_z += (v_ac_rrrr + 1u);
|
||||
self->private_data.f_mcu_blocks[0u][WUFFS_JPEG__UNZIG[v_z]] = ((uint16_t)(v_ac_value));
|
||||
if (v_z > 63u) {
|
||||
goto label__ac_components__break;
|
||||
}
|
||||
self->private_impl.f_mcu_zig_index = v_z;
|
||||
} else if (v_ac_rrrr < 15u) {
|
||||
goto label__ac_components__break;
|
||||
} else if ((self->private_impl.f_mcu_zig_index + 16u) > 63u) {
|
||||
goto label__ac_components__break;
|
||||
} else {
|
||||
self->private_impl.f_mcu_zig_index = (self->private_impl.f_mcu_zig_index + 16u);
|
||||
v_z += 16u;
|
||||
}
|
||||
}
|
||||
label__ac_components__break:;
|
||||
self->private_impl.f_mcu_zig_index = 0u;
|
||||
v_mcb = self->private_impl.f_mcu_current_block;
|
||||
self->private_impl.f_mcu_current_block += 1u;
|
||||
if (self->private_impl.f_test_only_interrupt_decode_mcu) {
|
||||
@@ -41857,9 +41852,11 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits(
|
||||
v_ret = 1u;
|
||||
goto label__goto_done__break;
|
||||
}
|
||||
v_z = self->private_impl.f_mcu_zig_index;
|
||||
self->private_impl.f_mcu_zig_index = 0u;
|
||||
v_ac_h = self->private_impl.f_mcu_blocks_ac_hselector[0u];
|
||||
v_ac_huff_table_fast = &self->private_impl.f_huff_tables_fast[v_ac_h][0u];
|
||||
while (true) {
|
||||
while (v_z <= ((uint32_t)(self->private_impl.f_scan_se))) {
|
||||
if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
|
||||
v_ret = 2u;
|
||||
goto label__goto_done__break;
|
||||
@@ -41903,12 +41900,8 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits(
|
||||
v_ac_value += (v_ac_extend & (((uint32_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 4294967295u));
|
||||
v_bits <<= v_ac_ssss;
|
||||
v_n_bits -= v_ac_ssss;
|
||||
v_z = (self->private_impl.f_mcu_zig_index + v_ac_rrrr + 1u);
|
||||
v_z += (v_ac_rrrr + 1u);
|
||||
self->private_data.f_mcu_blocks[0u][WUFFS_JPEG__UNZIG[v_z]] = ((uint16_t)(((uint32_t)(v_ac_value << self->private_impl.f_scan_al))));
|
||||
if (v_z > ((uint32_t)(self->private_impl.f_scan_se))) {
|
||||
goto label__ac_components__break;
|
||||
}
|
||||
self->private_impl.f_mcu_zig_index = v_z;
|
||||
} else if (v_ac_rrrr < 15u) {
|
||||
self->private_impl.f_eob_run = ((uint16_t)(((((uint16_t)(1u)) << v_ac_rrrr) - 1u)));
|
||||
if (v_ac_rrrr > 0u) {
|
||||
@@ -41917,14 +41910,11 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits(
|
||||
v_n_bits -= v_ac_rrrr;
|
||||
}
|
||||
goto label__ac_components__break;
|
||||
} else if ((self->private_impl.f_mcu_zig_index + 16u) > ((uint32_t)(self->private_impl.f_scan_se))) {
|
||||
goto label__ac_components__break;
|
||||
} else {
|
||||
self->private_impl.f_mcu_zig_index = (self->private_impl.f_mcu_zig_index + 16u);
|
||||
v_z += 16u;
|
||||
}
|
||||
}
|
||||
label__ac_components__break:;
|
||||
self->private_impl.f_mcu_zig_index = 0u;
|
||||
goto label__block__break;
|
||||
}
|
||||
label__block__break:;
|
||||
|
||||
@@ -149,9 +149,11 @@ pri func decoder.decode_mcu!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], m
|
||||
break.goto_done
|
||||
}
|
||||
|
||||
z = 1
|
||||
this.mcu_zig_index = 0
|
||||
ac_h = this.mcu_blocks_ac_hselector[this.mcu_current_block]
|
||||
ac_huff_table_fast = this.huff_tables_fast[ac_h][..] as ptr array[256] base.u16
|
||||
while.ac_components true,
|
||||
while.ac_components z < 64,
|
||||
inv this.mcu_current_block < 10,
|
||||
inv ac_huff_table_fast <> nullptr,
|
||||
{
|
||||
@@ -181,6 +183,7 @@ pri func decoder.decode_mcu!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], m
|
||||
while true,
|
||||
inv this.mcu_current_block < 10,
|
||||
inv ac_huff_table_fast <> nullptr,
|
||||
inv z < 64,
|
||||
{
|
||||
ac_ht_slow = this.huff_tables_slow[ac_h][ac_blm1]
|
||||
if ac_code < (ac_ht_slow >> 8) {
|
||||
@@ -211,23 +214,16 @@ pri func decoder.decode_mcu!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], m
|
||||
(((this.util.sign_extend_rshift_u64(a: bits, n: 63) & 0xFFFF_FFFF) as base.u32) ^ 0xFFFF_FFFF)
|
||||
bits ~mod<<= ac_ssss
|
||||
n_bits ~mod-= ac_ssss
|
||||
z = this.mcu_zig_index + ac_rrrr + 1
|
||||
z += ac_rrrr + 1
|
||||
this.mcu_blocks[0][UNZIG[z]] =
|
||||
(ac_value & 0xFFFF) as base.u16
|
||||
if z > 63 {
|
||||
break.ac_components
|
||||
}
|
||||
this.mcu_zig_index = z
|
||||
} else if ac_rrrr < 15 {
|
||||
break.ac_components
|
||||
} else if (this.mcu_zig_index + 16) > 63 {
|
||||
break.ac_components
|
||||
} else {
|
||||
this.mcu_zig_index = this.mcu_zig_index + 16
|
||||
z += 16
|
||||
}
|
||||
} endwhile.ac_components
|
||||
|
||||
this.mcu_zig_index = 0
|
||||
assert this.mcu_current_block < 10
|
||||
mcb = this.mcu_current_block
|
||||
this.mcu_current_block += 1
|
||||
|
||||
@@ -65,11 +65,15 @@ pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx
|
||||
break.goto_done
|
||||
}
|
||||
|
||||
z = this.mcu_zig_index
|
||||
this.mcu_zig_index = 0
|
||||
ac_h = this.mcu_blocks_ac_hselector[0]
|
||||
ac_huff_table_fast = this.huff_tables_fast[ac_h][..] as ptr array[256] base.u16
|
||||
while.ac_components true,
|
||||
while.ac_components z <= (this.scan_se as base.u32),
|
||||
inv ac_huff_table_fast <> nullptr,
|
||||
{
|
||||
assert z < 64 via "a < b: a <= c; c < b"(c: (this.scan_se as base.u32))
|
||||
|
||||
// Load at least 31 bits, by keeping 56 .. 64 loaded.
|
||||
//
|
||||
// TODO: eliminate this bounds check entirely.
|
||||
@@ -95,6 +99,7 @@ pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx
|
||||
n_bits ~mod-= 9
|
||||
while true,
|
||||
inv ac_huff_table_fast <> nullptr,
|
||||
inv z < 64,
|
||||
{
|
||||
ac_ht_slow = this.huff_tables_slow[ac_h][ac_blm1]
|
||||
if ac_code < (ac_ht_slow >> 8) {
|
||||
@@ -126,14 +131,9 @@ pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx
|
||||
(((this.util.sign_extend_rshift_u64(a: bits, n: 63) & 0xFFFF_FFFF) as base.u32) ^ 0xFFFF_FFFF)
|
||||
bits ~mod<<= ac_ssss
|
||||
n_bits ~mod-= ac_ssss
|
||||
z = this.mcu_zig_index + ac_rrrr + 1
|
||||
z += ac_rrrr + 1
|
||||
this.mcu_blocks[0][UNZIG[z]] =
|
||||
((ac_value ~mod<< this.scan_al) & 0xFFFF) as base.u16
|
||||
if z > (this.scan_se as base.u32) {
|
||||
break.ac_components
|
||||
}
|
||||
assert z <= 63 via "a <= b: a <= c; c <= b"(c: (this.scan_se as base.u32))
|
||||
this.mcu_zig_index = z
|
||||
} else if ac_rrrr < 15 {
|
||||
this.eob_run = (((1 as base.u16) << ac_rrrr) - 1) as base.u16
|
||||
if ac_rrrr > 0 {
|
||||
@@ -142,15 +142,11 @@ pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx
|
||||
n_bits ~mod-= ac_rrrr
|
||||
}
|
||||
break.ac_components
|
||||
} else if (this.mcu_zig_index + 16) > (this.scan_se as base.u32) {
|
||||
break.ac_components
|
||||
} else {
|
||||
assert (this.mcu_zig_index + 16) <= 63 via "a <= b: a <= c; c <= b"(c: (this.scan_se as base.u32))
|
||||
this.mcu_zig_index = this.mcu_zig_index + 16
|
||||
z += 16
|
||||
}
|
||||
} endwhile.ac_components
|
||||
|
||||
this.mcu_zig_index = 0
|
||||
break.block
|
||||
} endwhile.block
|
||||
|
||||
|
||||
Reference in new issue
Block a user