mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Factor out png.decoder.filter_N functions
wuffs_png_decode_19k_8bpp/clang9 92.1MB/s ± 0% 95.7MB/s ± 0% +3.89% (p=0.008 n=5+5) wuffs_png_decode_40k_24bpp/clang9 103MB/s ± 0% 110MB/s ± 0% +6.81% (p=0.008 n=5+5) wuffs_png_decode_77k_8bpp/clang9 348MB/s ± 0% 358MB/s ± 0% +2.90% (p=0.008 n=5+5) wuffs_png_decode_552k_32bpp/clang9 138MB/s ± 0% 136MB/s ± 0% -1.92% (p=0.008 n=5+5) wuffs_png_decode_4002k_24bpp/clang9 103MB/s ± 0% 111MB/s ± 0% +8.04% (p=0.008 n=5+5) wuffs_png_decode_filter_1_sub/clang9 738MB/s ± 0% 646MB/s ± 0% -12.51% (p=0.008 n=5+5) wuffs_png_decode_filter_2_up/clang9 13.4GB/s ± 0% 13.1GB/s ± 0% -2.51% (p=0.008 n=5+5) wuffs_png_decode_filter_3_average/clang9 329MB/s ± 0% 481MB/s ± 0% +46.25% (p=0.008 n=5+5) wuffs_png_decode_filter_4_paeth/clang9 70.0MB/s ± 0% 65.3MB/s ± 0% -6.80% (p=0.008 n=5+5) wuffs_png_decode_19k_8bpp/gcc10 98.0MB/s ± 0% 98.0MB/s ± 0% ~ (p=0.690 n=5+5) wuffs_png_decode_40k_24bpp/gcc10 118MB/s ± 0% 118MB/s ± 0% +0.43% (p=0.016 n=5+5) wuffs_png_decode_77k_8bpp/gcc10 318MB/s ± 0% 317MB/s ± 0% -0.19% (p=0.008 n=5+5) wuffs_png_decode_552k_32bpp/gcc10 161MB/s ± 0% 159MB/s ± 0% -1.38% (p=0.008 n=5+5) wuffs_png_decode_4002k_24bpp/gcc10 118MB/s ± 0% 118MB/s ± 0% ~ (p=0.056 n=5+5) wuffs_png_decode_filter_1_sub/gcc10 932MB/s ± 0% 931MB/s ± 0% ~ (p=0.151 n=5+5) wuffs_png_decode_filter_2_up/gcc10 11.0GB/s ± 1% 11.4GB/s ± 0% +3.32% (p=0.016 n=4+5) wuffs_png_decode_filter_3_average/gcc10 645MB/s ± 0% 643MB/s ± 0% -0.29% (p=0.008 n=5+5) wuffs_png_decode_filter_4_paeth/gcc10 90.1MB/s ± 0% 83.6MB/s ± 0% -7.24% (p=0.008 n=5+5)
This commit is contained in:
1 parent
aa2d41e0a0
commit
a575ad8d2d
2 files changed
+273
-179
No files matched your search
+116
-99
@@ -398,7 +398,6 @@ pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice
|
||||
var dst_bytes_per_row : base.u64
|
||||
var dst_palette : slice base.u8
|
||||
var tab : table base.u8
|
||||
var filter_distance : base.u64[..= 8]
|
||||
|
||||
var y : base.u32
|
||||
var dst : slice base.u8
|
||||
@@ -406,15 +405,6 @@ pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice
|
||||
var curr_row : slice base.u8
|
||||
var prev_row : slice base.u8
|
||||
|
||||
var i : base.u64
|
||||
var fa : base.u32
|
||||
var fb : base.u32
|
||||
var fc : base.u32
|
||||
var pp : base.u32
|
||||
var pa : base.u32
|
||||
var pb : base.u32
|
||||
var pc : base.u32
|
||||
|
||||
// TODO: the dst_pixfmt variable shouldn't be necessary. We should be able
|
||||
// to chain the two calls: "args.dst.pixel_format().bits_per_pixel()".
|
||||
dst_pixfmt = args.dst.pixel_format()
|
||||
@@ -426,7 +416,6 @@ pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice
|
||||
dst_bytes_per_row = (this.width as base.u64) * dst_bytes_per_pixel
|
||||
dst_palette = args.dst.palette_or_else(fallback: this.dst_palette[..])
|
||||
tab = args.dst.plane(p: 0)
|
||||
filter_distance = this.filter_distance as base.u64
|
||||
|
||||
while y < this.height {
|
||||
assert y < 0xFFFF_FFFF via "a < b: a < c; c <= b"(c: this.height)
|
||||
@@ -449,97 +438,13 @@ pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice
|
||||
if filter == 0 {
|
||||
// No-op.
|
||||
} else if filter == 1 {
|
||||
i = filter_distance
|
||||
while i < curr_row.length(),
|
||||
inv y < 0xFFFF_FFFF,
|
||||
{
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: curr_row.length())
|
||||
if i >= filter_distance {
|
||||
if (i - filter_distance) < curr_row.length() {
|
||||
curr_row[i] ~mod+= curr_row[i - filter_distance]
|
||||
}
|
||||
}
|
||||
i += 1
|
||||
} endwhile
|
||||
this.filter_1!(curr: curr_row)
|
||||
} else if filter == 2 {
|
||||
i = 0
|
||||
while (i < curr_row.length()) and (i < prev_row.length()),
|
||||
inv y < 0xFFFF_FFFF,
|
||||
{
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: curr_row.length())
|
||||
curr_row[i] ~mod+= prev_row[i]
|
||||
i += 1
|
||||
} endwhile
|
||||
this.filter_2!(curr: curr_row, prev: prev_row)
|
||||
} else if filter == 3 {
|
||||
if y == 0 {
|
||||
i = filter_distance
|
||||
while i < curr_row.length(),
|
||||
inv y < 0xFFFF_FFFF,
|
||||
{
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: curr_row.length())
|
||||
if i >= filter_distance {
|
||||
if (i - filter_distance) < curr_row.length() {
|
||||
curr_row[i] ~mod+= curr_row[i - filter_distance] / 2
|
||||
}
|
||||
}
|
||||
i += 1
|
||||
} endwhile
|
||||
} else {
|
||||
i = 0
|
||||
while (i < curr_row.length()) and (i < prev_row.length()),
|
||||
inv y < 0xFFFF_FFFF,
|
||||
{
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: curr_row.length())
|
||||
if i >= filter_distance {
|
||||
if (i - filter_distance) < curr_row.length() {
|
||||
curr_row[i] ~mod+= ((
|
||||
(curr_row[i - filter_distance] as base.u32) +
|
||||
(prev_row[i] as base.u32)) / 2) as base.u8
|
||||
}
|
||||
} else {
|
||||
curr_row[i] ~mod+= prev_row[i] / 2
|
||||
}
|
||||
i += 1
|
||||
} endwhile
|
||||
}
|
||||
this.filter_3!(curr: curr_row, prev: prev_row)
|
||||
} else if filter == 4 {
|
||||
i = 0
|
||||
while (i < curr_row.length()) and (i < prev_row.length()),
|
||||
inv y < 0xFFFF_FFFF,
|
||||
{
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: curr_row.length())
|
||||
if i < filter_distance {
|
||||
curr_row[i] ~mod+= prev_row[i]
|
||||
} else {
|
||||
if ((i - filter_distance) < curr_row.length()) and
|
||||
((i - filter_distance) < prev_row.length()) {
|
||||
fa = curr_row[i - filter_distance] as base.u32
|
||||
fb = prev_row[i] as base.u32
|
||||
fc = prev_row[i - filter_distance] as base.u32
|
||||
pp = (fa ~mod+ fb) ~mod- fc
|
||||
pa = pp ~mod- fa
|
||||
if pa >= 0x8000_0000 {
|
||||
pa = 0 ~mod- pa
|
||||
}
|
||||
pb = pp ~mod- fb
|
||||
if pb >= 0x8000_0000 {
|
||||
pb = 0 ~mod- pb
|
||||
}
|
||||
pc = pp ~mod- fc
|
||||
if pc >= 0x8000_0000 {
|
||||
pc = 0 ~mod- pc
|
||||
}
|
||||
if (pa <= pb) and (pa <= pc) {
|
||||
curr_row[i] ~mod+= (fa & 0xFF) as base.u8
|
||||
} else if pb <= pc {
|
||||
curr_row[i] ~mod+= (fb & 0xFF) as base.u8
|
||||
} else {
|
||||
curr_row[i] ~mod+= (fc & 0xFF) as base.u8
|
||||
}
|
||||
}
|
||||
}
|
||||
i += 1
|
||||
} endwhile
|
||||
this.filter_4!(curr: curr_row, prev: prev_row)
|
||||
} else {
|
||||
return "#bad filter"
|
||||
}
|
||||
@@ -556,6 +461,118 @@ pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice
|
||||
return ok
|
||||
}
|
||||
|
||||
pri func decoder.filter_1!(curr: slice base.u8) {
|
||||
var filter_distance : base.u64[..= 8]
|
||||
var i : base.u64
|
||||
|
||||
filter_distance = this.filter_distance as base.u64
|
||||
i = filter_distance
|
||||
while i < args.curr.length() {
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length())
|
||||
if i >= filter_distance {
|
||||
if (i - filter_distance) < args.curr.length() {
|
||||
args.curr[i] ~mod+= args.curr[i - filter_distance]
|
||||
}
|
||||
}
|
||||
i += 1
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8) {
|
||||
var i : base.u64
|
||||
|
||||
i = 0
|
||||
while (i < args.curr.length()) and (i < args.prev.length()) {
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length())
|
||||
args.curr[i] ~mod+= args.prev[i]
|
||||
i += 1
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) {
|
||||
var filter_distance : base.u64[..= 8]
|
||||
var i : base.u64
|
||||
|
||||
filter_distance = this.filter_distance as base.u64
|
||||
if args.prev.length() == 0 {
|
||||
i = filter_distance
|
||||
while i < args.curr.length() {
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length())
|
||||
if i >= filter_distance {
|
||||
if (i - filter_distance) < args.curr.length() {
|
||||
args.curr[i] ~mod+= args.curr[i - filter_distance] / 2
|
||||
}
|
||||
}
|
||||
i += 1
|
||||
} endwhile
|
||||
} else {
|
||||
i = 0
|
||||
while (i < args.curr.length()) and (i < args.prev.length()) {
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length())
|
||||
if i >= filter_distance {
|
||||
if (i - filter_distance) < args.curr.length() {
|
||||
args.curr[i] ~mod+= ((
|
||||
(args.curr[i - filter_distance] as base.u32) +
|
||||
(args.prev[i] as base.u32)) / 2) as base.u8
|
||||
}
|
||||
} else {
|
||||
args.curr[i] ~mod+= args.prev[i] / 2
|
||||
}
|
||||
i += 1
|
||||
} endwhile
|
||||
}
|
||||
}
|
||||
|
||||
pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8) {
|
||||
var filter_distance : base.u64[..= 8]
|
||||
var i : base.u64
|
||||
|
||||
var fa : base.u32
|
||||
var fb : base.u32
|
||||
var fc : base.u32
|
||||
var pp : base.u32
|
||||
var pa : base.u32
|
||||
var pb : base.u32
|
||||
var pc : base.u32
|
||||
|
||||
filter_distance = this.filter_distance as base.u64
|
||||
i = 0
|
||||
while (i < args.curr.length()) and (i < args.prev.length()) {
|
||||
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length())
|
||||
if i < filter_distance {
|
||||
args.curr[i] ~mod+= args.prev[i]
|
||||
} else {
|
||||
if ((i - filter_distance) < args.curr.length()) and
|
||||
((i - filter_distance) < args.prev.length()) {
|
||||
fa = args.curr[i - filter_distance] as base.u32
|
||||
fb = args.prev[i] as base.u32
|
||||
fc = args.prev[i - filter_distance] as base.u32
|
||||
pp = (fa ~mod+ fb) ~mod- fc
|
||||
pa = pp ~mod- fa
|
||||
if pa >= 0x8000_0000 {
|
||||
pa = 0 ~mod- pa
|
||||
}
|
||||
pb = pp ~mod- fb
|
||||
if pb >= 0x8000_0000 {
|
||||
pb = 0 ~mod- pb
|
||||
}
|
||||
pc = pp ~mod- fc
|
||||
if pc >= 0x8000_0000 {
|
||||
pc = 0 ~mod- pc
|
||||
}
|
||||
if (pa <= pb) and (pa <= pc) {
|
||||
args.curr[i] ~mod+= (fa & 0xFF) as base.u8
|
||||
} else if pb <= pc {
|
||||
args.curr[i] ~mod+= (fb & 0xFF) as base.u8
|
||||
} else {
|
||||
args.curr[i] ~mod+= (fc & 0xFF) as base.u8
|
||||
}
|
||||
}
|
||||
}
|
||||
i += 1
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pub func decoder.frame_dirty_rect() base.rect_ie_u32 {
|
||||
return this.util.make_rect_ie_u32(
|
||||
min_incl_x: 0,
|
||||
|
||||
Reference in new issue
Block a user