mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 00:47:28 +01:00
std/jpeg: allow fewer-components sequential scans
name old speed new speed delta wuffs_jpeg_decode_19k_8bpp/clang11 366MB/s ± 0% 369MB/s ± 0% +0.81% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/clang11 302MB/s ± 0% 309MB/s ± 0% +2.28% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/clang11 1.00GB/s ± 0% 1.00GB/s ± 0% -0.58% (p=0.008 n=5+5) wuffs_jpeg_decode_77k_24bpp/clang11 820MB/s ± 0% 827MB/s ± 0% +0.80% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/clang11 895MB/s ± 0% 897MB/s ± 0% +0.24% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/clang11 1.11GB/s ± 0% 1.10GB/s ± 0% -0.30% (p=0.008 n=5+5) wuffs_jpeg_decode_4002k_24bpp/clang11 897MB/s ± 0% 900MB/s ± 0% +0.30% (p=0.008 n=5+5) wuffs_jpeg_decode_19k_8bpp/gcc10 370MB/s ± 0% 369MB/s ± 0% -0.26% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/gcc10 309MB/s ± 0% 283MB/s ± 0% -8.35% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/gcc10 948MB/s ± 0% 945MB/s ± 0% -0.27% (p=0.008 n=5+5) wuffs_jpeg_decode_77k_24bpp/gcc10 769MB/s ± 0% 769MB/s ± 0% ~ (p=0.310 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/gcc10 841MB/s ± 0% 842MB/s ± 0% +0.13% (p=0.016 n=4+5) wuffs_jpeg_decode_552k_24bpp_444/gcc10 1.00GB/s ± 0% 1.01GB/s ± 0% +0.75% (p=0.016 n=4+5) wuffs_jpeg_decode_4002k_24bpp/gcc10 846MB/s ± 0% 848MB/s ± 0% +0.22% (p=0.008 n=5+5)
This commit is contained in:
1 parent
2f5f203d1b
commit
14a8bd0feb
3 files changed
+46
-28
No files matched your search
@@ -41850,6 +41850,9 @@ wuffs_jpeg__decoder__do_decode_frame(
|
||||
} else if (self->private_impl.f_components_workbuf_offsets[4u] < self->private_impl.f_components_workbuf_offsets[8u]) {
|
||||
wuffs_base__bulk_memset(a_workbuf.ptr + self->private_impl.f_components_workbuf_offsets[4u], (self->private_impl.f_components_workbuf_offsets[8u] - self->private_impl.f_components_workbuf_offsets[4u]), 0u);
|
||||
}
|
||||
if (self->private_impl.f_components_workbuf_offsets[4u] <= ((uint64_t)(a_workbuf.len))) {
|
||||
wuffs_base__bulk_memset(a_workbuf.ptr, self->private_impl.f_components_workbuf_offsets[4u], 128u);
|
||||
}
|
||||
while (true) {
|
||||
while (true) {
|
||||
{
|
||||
@@ -42479,7 +42482,7 @@ wuffs_jpeg__decoder__prepare_scan(
|
||||
goto exit;
|
||||
}
|
||||
self->private_impl.f_scan_num_components = ((uint32_t)(v_c));
|
||||
if ((self->private_impl.f_scan_num_components > self->private_impl.f_num_components) || ((self->private_impl.f_scan_num_components < self->private_impl.f_num_components) && (self->private_impl.f_sof_marker < 194u)) || (self->private_impl.f_payload_length != (4u + (2u * self->private_impl.f_scan_num_components)))) {
|
||||
if ((self->private_impl.f_scan_num_components > self->private_impl.f_num_components) || (self->private_impl.f_payload_length != (4u + (2u * self->private_impl.f_scan_num_components)))) {
|
||||
status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
|
||||
goto exit;
|
||||
}
|
||||
@@ -42501,22 +42504,23 @@ wuffs_jpeg__decoder__prepare_scan(
|
||||
status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
|
||||
goto exit;
|
||||
}
|
||||
if (v_c != self->private_impl.f_components_c[v_j]) {
|
||||
v_j += 1u;
|
||||
continue;
|
||||
}
|
||||
if (v_i > 0u) {
|
||||
if (v_j <= ((uint32_t)(self->private_impl.f_scan_comps_cselector[(v_i - 1u)]))) {
|
||||
status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
|
||||
if (v_c == self->private_impl.f_components_c[v_j]) {
|
||||
if ( ! self->private_impl.f_seen_dqt[self->private_impl.f_components_tq[v_j]]) {
|
||||
status = wuffs_base__make_status(wuffs_jpeg__error__missing_quantization_table);
|
||||
goto exit;
|
||||
}
|
||||
self->private_impl.f_scan_comps_cselector[v_i] = ((uint8_t)(v_j));
|
||||
break;
|
||||
}
|
||||
if ( ! self->private_impl.f_seen_dqt[self->private_impl.f_components_tq[v_j]]) {
|
||||
status = wuffs_base__make_status(wuffs_jpeg__error__missing_quantization_table);
|
||||
v_j += 1u;
|
||||
}
|
||||
v_j = 0u;
|
||||
while (v_j < v_i) {
|
||||
if (self->private_impl.f_scan_comps_cselector[v_i] == self->private_impl.f_scan_comps_cselector[v_j]) {
|
||||
status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
|
||||
goto exit;
|
||||
}
|
||||
self->private_impl.f_scan_comps_cselector[v_i] = ((uint8_t)(v_j));
|
||||
break;
|
||||
v_j += 1u;
|
||||
}
|
||||
{
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
|
||||
|
||||
Reference in new issue
Block a user