Have std/tga decode RLE images

Updates #67
This commit is contained in:
Nigel Tao committed 2022-01-15 14:10:05 +11:00
1 parent fc77dc35ff
commit f4002c5b21
3 files changed
+285 -20

No files matched your search

+146 -12
View File
@@ -13,6 +13,7 @@
// limitations under the License.
pub status "#bad header"
pub status "#bad run length encoding"
pub status "#unsupported TGA file"
pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0
@@ -61,8 +62,9 @@ pub struct decoder? implements base.image_decoder(
opaque : base.bool,
src_bytes_per_pixel : base.u32[..= 4],
src_pixfmt : base.u32,
scratch_bytes_per_pixel : base.u32[..= 4],
src_bytes_per_pixel : base.u32[..= 4],
src_pixfmt : base.u32,
frame_config_io_position : base.u64,
@@ -95,13 +97,11 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_
this.header_image_type = args.src.read_u8?()
if (this.header_image_type == 0x01) or
(this.header_image_type == 0x02) or
(this.header_image_type == 0x03) {
// No-op.
} else if (this.header_image_type == 0x09) or
(this.header_image_type == 0x03) or
(this.header_image_type == 0x09) or
(this.header_image_type == 0x0A) or
(this.header_image_type == 0x0B) {
// TODO: support run-length encoding.
return "#unsupported TGA file"
// No-op.
} else {
// TODO: 0x20 and 0x21 are invalid, according to the spec, but are
// apparently unofficial extensions.
@@ -151,6 +151,7 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_
}
if (this.header_image_type | 8) == 0x09 {
this.scratch_bytes_per_pixel = 1
this.src_bytes_per_pixel = 1
this.src_pixfmt = base.PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL
this.opaque =
@@ -158,13 +159,20 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_
(this.header_color_map_entry_size <> 0x18)
} else if (this.header_image_type | 8) == 0x0A {
if this.header_pixel_depth == 0x10 {
if (this.header_pixel_depth == 0x0F) or
(this.header_pixel_depth == 0x10) {
// Wuffs' base.pixel_swizzler doesn't support BGRX5551, so
// scratch_bytes_per_pixel and src_bytes_per_pixel are different.
this.scratch_bytes_per_pixel = 4
this.src_bytes_per_pixel = 0
this.src_pixfmt = base.PIXEL_FORMAT__BGRA_NONPREMUL
} else if this.header_pixel_depth == 0x18 {
this.scratch_bytes_per_pixel = 3
this.src_bytes_per_pixel = 3
this.src_pixfmt = base.PIXEL_FORMAT__BGR
this.opaque = true
} else if this.header_pixel_depth == 0x20 {
this.scratch_bytes_per_pixel = 4
this.src_bytes_per_pixel = 4
this.src_pixfmt = base.PIXEL_FORMAT__BGRA_NONPREMUL
} else {
@@ -173,6 +181,7 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_
} else {
if this.header_pixel_depth == 0x08 {
this.scratch_bytes_per_pixel = 1
this.src_bytes_per_pixel = 1
this.src_pixfmt = base.PIXEL_FORMAT__Y
this.opaque = true
@@ -292,6 +301,7 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
var num_pixels64 : base.u64
var num_pixels32 : base.u32[..= 0xFFFF]
var lit_length : base.u32[..= 0xFFFF]
var run_length : base.u32[..= 0xFFFF]
var num_dst_bytes : base.u64[..= 0x1F_FFE0]
var num_src_bytes : base.u32[..= 0x3_FFFC]
var c : base.u32
@@ -330,7 +340,11 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
if (this.header_image_descriptor & 0x20) == 0 { // Bottom-to-top.
dst_y = this.height ~mod- 1
}
lit_length = this.width
if (this.header_image_type & 8) == 0 {
// No RLE (run length encoding) means that the entire row is
// effectively literals.
lit_length = this.width
}
while.resume true {
tab = args.dst.plane(p: 0)
@@ -346,7 +360,7 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
}
while dst_x < this.width {
assert dst_x < 0xFFFF_FFFF via "a < b: a < c; c <= b"(c: this.width)
assert dst_x <= 0xFFFF via "a <= b: a <= c; c <= b"(c: this.width)
if this.src_bytes_per_pixel > 0 {
if lit_length > 0 {
@@ -365,12 +379,81 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
} else {
dst = this.util.empty_slice_u8()
}
dst_x ~mod+= num_pixels32
dst_x += num_pixels32
lit_length = (lit_length ~mod- num_pixels32) & 0xFFFF
if lit_length > 0 {
yield? base."$short read"
continue.resume
}
} else if run_length > 0 {
run_length -= 1
this.swizzler.swizzle_interleaved_from_slice!(
dst: dst,
dst_palette: dst_palette,
src: this.scratch[.. this.scratch_bytes_per_pixel])
if dst_bytes_per_pixel <= dst.length() {
dst = dst[dst_bytes_per_pixel ..]
}
dst_x += 1
} else {
// Handle Raw vs RLE packets.
if args.src.length() <= 0 {
yield? base."$short read"
continue.resume
}
if args.src.peek_u8_as_u32() < 0x80 {
lit_length = args.src.peek_u8_as_u32() + 1
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
if (lit_length + dst_x) > this.width {
return "#bad run length encoding"
}
} else {
if this.src_bytes_per_pixel == 1 {
if args.src.length() < 2 {
yield? base."$short read"
continue.resume
}
run_length = (args.src.peek_u8_as_u32() & 0x7F) + 1
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.scratch[0] = args.src.peek_u8()
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
} else if this.src_bytes_per_pixel == 3 {
if args.src.length() < 4 {
yield? base."$short read"
continue.resume
}
run_length = (args.src.peek_u8_as_u32() & 0x7F) + 1
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.scratch[0] = args.src.peek_u8()
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.scratch[1] = args.src.peek_u8()
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.scratch[2] = args.src.peek_u8()
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
} else { // this.src_bytes_per_pixel == 4
if args.src.length() < 5 {
yield? base."$short read"
continue.resume
}
run_length = (args.src.peek_u8_as_u32() & 0x7F) + 1
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.scratch[0] = args.src.peek_u8()
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.scratch[1] = args.src.peek_u8()
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.scratch[2] = args.src.peek_u8()
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
this.scratch[3] = args.src.peek_u8()
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
}
if (run_length + dst_x) > this.width {
return "#bad run length encoding"
}
}
}
} else {
@@ -401,6 +484,53 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
}
dst_x += 1
lit_length -= 1
} else if run_length > 0 {
run_length -= 1
this.swizzler.swizzle_interleaved_from_slice!(
dst: dst,
dst_palette: dst_palette,
src: this.scratch[.. this.scratch_bytes_per_pixel])
if dst_bytes_per_pixel <= dst.length() {
dst = dst[dst_bytes_per_pixel ..]
}
dst_x += 1
} else {
// Handle Raw vs RLE packets.
if args.src.length() <= 0 {
yield? base."$short read"
continue.resume
}
if args.src.peek_u8_as_u32() < 0x80 {
lit_length = args.src.peek_u8_as_u32() + 1
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
if (lit_length + dst_x) > this.width {
return "#bad run length encoding"
}
} else {
if args.src.length() < 3 {
yield? base."$short read"
continue.resume
}
run_length = (args.src.peek_u8_as_u32() & 0x7F) + 1
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
c = args.src.peek_u16le_as_u32()
args.src.skip_u32_fast!(actual: 2, worst_case: 2)
c5 = 0x1F & (c >> 0)
this.scratch[0] = ((c5 << 3) | (c5 >> 2)) as base.u8
c5 = 0x1F & (c >> 5)
this.scratch[1] = ((c5 << 3) | (c5 >> 2)) as base.u8
c5 = 0x1F & (c >> 10)
this.scratch[2] = ((c5 << 3) | (c5 >> 2)) as base.u8
// TODO: can the alpha value be zero (BGRA5551 not BGRX5551)?
this.scratch[3] = 0xFF
if (run_length + dst_x) > this.width {
return "#bad run length encoding"
}
}
}
}
} endwhile
@@ -411,7 +541,11 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader,
} else { // Top-to-bottom.
dst_y ~mod+= 1
}
lit_length = this.width
if (this.header_image_type & 8) == 0 {
// No RLE (run length encoding) means that the entire row is
// effectively literals.
lit_length = this.width
}
} endwhile
break.resume
} endwhile.resume