8 Commits

Author SHA1 Message Date
Ishotihadus cb0ca77c9b version 3.9.2 2018-01-15 19:06:02 +09:00
Ishotihadus 4204f05c0b Accelerate decoding ETC1 a little 2018-01-15 19:04:45 +09:00
Ishotihadus c8c34d6c80 Edit README 2018-01-15 18:56:20 +09:00
Ishotihadus c37dd49732 Support ASTC Image 2018-01-15 18:54:48 +09:00
Ishotihadus 0e5dafa424 Fix undefined variable bug in mikunyan-json 2017-12-27 17:31:13 +09:00
Ishotihadus 7bb8f0a0a4 Fix no method errors in ImageDecoder 2017-10-08 21:04:41 +09:00
Ishotihadus 2c8f95b6fd Modify Readme 2017-09-09 00:34:36 +09:00
Ishotihadus d40f307802 Add ETC2 Support 2017-09-09 00:32:19 +09:00
6 changed files with 731 additions and 15 deletions
+2 -2
View File
@@ -104,7 +104,7 @@ obj.key
You can get png file directly from Texture2D asset. Output object's class is `ChunkyPNG::Image`.
Only some basic texture formats (1--5, 7, 9, 13--20, 22, 62, and 63) and ETC_RGB4 (34) are available.
Some basic texture formats (1--5, 7, 9, 13--20, 22, 62, and 63), ETC_RGB4 (34), ETC2 (45, 47), and ASTC (48--59) are available.
```ruby
require 'mikunyan/decoders'
@@ -119,7 +119,7 @@ img = Mikunyan::ImageDecoder.decode_object(obj)
img.save('mikunyan.png')
```
Mikunyan cannot decode ASTC files. Use `Mikunyan::ImageDecoder.create_astc_file` instead.
Mikunyan cannot decode ASTC with HDR data. Use `Mikunyan::ImageDecoder.create_astc_file` instead.
### Json / YAML Outputer
+1 -1
View File
@@ -39,7 +39,7 @@ while i < ARGV.count
i += 1
end
if option[:pretty] && option[:yaml]
if opts[:pretty] && opts[:yaml]
warn("Option --pretty is ignored if --yaml is specified.")
end
+6
View File
@@ -1 +1,7 @@
require 'mikunyan/decoders/image_decoder'
module Mikunyan
# Module for helper classes for decoding object
module DecodeHelper
end
end
+530
View File
@@ -0,0 +1,530 @@
require 'bin_utils'
require 'fiddle'
module Mikunyan
module DecodeHelper
# Class for decode ASTC block
# @attr_reader [String] data decoded data
class AstcBlockDecoder
attr_reader :data
# Decode block
# @param [String] bin binary
# @param [Integer] bw block width
# @param [Integer] bh block height
def initialize(bin, bw, bh)
if bin[0].ord == 0xfc && bin[1].ord % 2 == 1
@data = (bin[9] + bin[11] + bin[13] + bin[15]) * bw * bh
else
@d2 = BinUtils.get_int64_le(bin)
@d1 = BinUtils.get_int64_le(bin, 8)
@bw = bw
@bh = bh
decode_block_params
decode_endpoints
decode_weights
select_partition
applicate_color
end
end
private
WeightPrecTableA = [nil, nil, 0, 3, 0, 5, 3, 0, nil, nil, 5, 3, 0, 5, 3, 0]
WeightPrecTableB = [nil, nil, 1, 0, 2, 0, 1, 3, nil, nil, 1, 2, 4, 2, 3, 5]
CemTableA = [0, 0, 3, 0, 5, 3, 0, 5, 3, 0, 5, 3, 0, 5, 3, 0, 5, 3, 0]
CemTableB = [1, 2, 1, 3, 1, 2, 4, 2, 3, 5, 3, 4, 6, 4, 5, 7, 5, 6, 8]
TritsTable = [
[0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 1, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 1, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 0, 1, 2, 2, 0, 1, 2, 2],
[0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 1, 2, 2, 2, 0, 0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 1, 2, 2, 2, 0, 0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 1, 2, 2, 2, 1, 0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 1, 2, 2, 2, 1],
[0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 2, 2, 2, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, 2, 2, 2, 2],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]
]
QuintsTable = [
[0, 1, 2, 3, 4, 0, 4, 4, 0, 1, 2, 3, 4, 1, 4, 4, 0, 1, 2, 3, 4, 2, 4, 4, 0, 1, 2, 3, 4, 3, 4, 4, 0, 1, 2, 3, 4, 0, 4, 0, 0, 1, 2, 3, 4, 1, 4, 1, 0, 1, 2, 3, 4, 2, 4, 2, 0, 1, 2, 3, 4, 3, 4, 3, 0, 1, 2, 3, 4, 0, 2, 3, 0, 1, 2, 3, 4, 1, 2, 3, 0, 1, 2, 3, 4, 2, 2, 3, 0, 1, 2, 3, 4, 3, 2, 3, 0, 1, 2, 3, 4, 0, 0, 1, 0, 1, 2, 3, 4, 1, 0, 1, 0, 1, 2, 3, 4, 2, 0, 1, 0, 1, 2, 3, 4, 3, 0, 1],
[0, 0, 0, 0, 0, 4, 4, 4, 1, 1, 1, 1, 1, 4, 4, 4, 2, 2, 2, 2, 2, 4, 4, 4, 3, 3, 3, 3, 3, 4, 4, 4, 0, 0, 0, 0, 0, 4, 0, 4, 1, 1, 1, 1, 1, 4, 1, 4, 2, 2, 2, 2, 2, 4, 2, 4, 3, 3, 3, 3, 3, 4, 3, 4, 0, 0, 0, 0, 0, 4, 0, 0, 1, 1, 1, 1, 1, 4, 1, 1, 2, 2, 2, 2, 2, 4, 2, 2, 3, 3, 3, 3, 3, 4, 3, 3, 0, 0, 0, 0, 0, 4, 0, 0, 1, 1, 1, 1, 1, 4, 1, 1, 2, 2, 2, 2, 2, 4, 2, 2, 3, 3, 3, 3, 3, 4, 3, 3],
[0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 0, 2, 4, 0, 0, 0, 0, 0, 0, 3, 4, 1, 1, 1, 1, 1, 1, 4, 4, 1, 1, 1, 1, 1, 1, 4, 4, 1, 1, 1, 1, 1, 1, 4, 4, 1, 1, 1, 1, 1, 1, 4, 4, 2, 2, 2, 2, 2, 2, 4, 4, 2, 2, 2, 2, 2, 2, 4, 4, 2, 2, 2, 2, 2, 2, 4, 4, 2, 2, 2, 2, 2, 2, 4, 4, 3, 3, 3, 3, 3, 3, 4, 4, 3, 3, 3, 3, 3, 3, 4, 4, 3, 3, 3, 3, 3, 3, 4, 4, 3, 3, 3, 3, 3, 3, 4, 4]
]
def [](i, j = 1)
if j < 1
0
elsif j == 1
i < 64 ? @d2[i] : @d1[i - 64]
else
if i + j <= 64
@d2 >> i & (1 << j) - 1
elsif i >= 64
@d1 >> (i - 64) & (1 << j) - 1
else
@d2 >> i | (@d1 & (1 << i + j - 64) - 1) << 64 - i
end
end
end
def decode_block_params
# Block Mode
@weight_range = @d2 >> 4 & 1 | @d2 >> 6 & 8
@dual_plane = @d2 & 0x400 == 0x400
if @d2 & 0x3 != 0
@weight_range |= @d2 << 1 & 6
case @d2 & 0xc
when 0
@width = (@d2 >> 7 & 3) + 4
@height = (@d2 >> 5 & 3) + 2
when 0x4
@width = (@d2 >> 7 & 3) + 8
@height = (@d2 >> 5 & 3) + 2
when 0x8
@width = (@d2 >> 5 & 3) + 2
@height = (@d2 >> 7 & 3) + 8
else # 0xc
if @d2 & 0x100 == 0
@width = (@d2 >> 5 & 3) + 2
@height = @d2[7] + 6
else
@width = @d2[7] + 2
@height = (@d2 >> 5 & 3) + 2
end
end
else
@weight_range |= @d2 >> 1 & 6
case @d2 & 0x180
when 0
@width = 12
@height = (@d2 >> 5 & 3) + 2
when 0x80
@width = (@d2 >> 5 & 3) + 2
@height = 12
when 0x180
@width = (@d2 & 0x20 == 0) ? 6 : 10
@height = 16 - @width
else # 0x100
@width = (@d2 >> 5 & 3) + 6
@height = (@d2 >> 9 & 3) + 6
@dual_plane = false
@weight_range &= 7
end
end
# Count Partitions
@part_num = (@d2 >> 11 & 3) + 1
# Count Weight Bits
@weight_num = @width * @height
@weight_num *= 2 if @dual_plane
case WeightPrecTableA[@weight_range]
when 3
@weight_bit = @weight_num * WeightPrecTableB[@weight_range] + (@weight_num * 8 + 4) / 5
when 5
@weight_bit = @weight_num * WeightPrecTableB[@weight_range] + (@weight_num * 7 + 2) / 3
else # 0
@weight_bit = @weight_num * WeightPrecTableB[@weight_range]
end
# CEM
if @part_num == 1
@cem = [@d2 >> 13 & 0xf]
config_bit = 17
else
cembase = @d2 >> 23 & 3
if cembase == 0
@cem = Array.new(@part_num, @d2 >> 25 & 0xf)
config_bit = 29
else
@cem = (0...@part_num).map{|i| ((@d2 >> (25 + i) & 1) + cembase - 1) << 2}
case @part_num
when 2
@cem[0] |= @d2 >> 27 & 3
@cem[1] |= self[126 - @weight_bit, 2]
when 3
@cem[0] |= @d2[28]
@cem[0] |= self[123 - @weight_bit] << 1
@cem[1] |= self[124 - @weight_bit, 2]
@cem[2] |= self[126 - @weight_bit, 2]
else # 4
4.times do |i|
@cem[i] |= self[120 + 2 * i - @weight_bit, 2]
end
end
config_bit = 25 + @part_num * 3
end
end
# Count Color Endpoint Bits
config_bit += 2 if @dual_plane
remain_bit = 128 - config_bit - @weight_bit
@cem_num = @cem.map{|i| (i >> 1 & 6) + 2}.inject(:+)
CemTableA.count.times do |n|
i = CemTableA.count - n - 1
case CemTableA[i]
when 3
@cem_bit = @cem_num * CemTableB[i] + (@cem_num * 8 + 4) / 5
when 5
@cem_bit = @cem_num * CemTableB[i] + (@cem_num * 7 + 2) / 3
else # 0
@cem_bit = @cem_num * CemTableB[i]
end
if @cem_bit <= remain_bit
@cem_range = i
break
end
end
if @dual_plane
if @part_num == 1 || cembase == 0
@plane_selector = self[126 - @weight_bit, 2]
else
@plane_selector = self[130 - @weight_bit - @part_num * 3, 2]
end
end
end
def decode_endpoints
values = decode_intseq_raw(self[@part_num == 1 ? 17 : 29, @cem_bit], CemTableA[@cem_range], CemTableB[@cem_range], @cem_num).map do |e|
unquantize_endpoint(CemTableA[@cem_range], CemTableB[@cem_range], e[0], e[1])
end
@endpoint = @cem.map do |cem|
v = values.slice!(0, (cem >> 1 & 6) + 2)
case cem
when 0
[v[0], v[0], v[0], 255, v[1], v[1], v[1], 255]
when 1
l0 = (v[0] >> 2) | (v[1] & 0xc0)
l1 = (l0 + (v[1] & 0x3f)).clamp(0, 255)
[l0, l0, l0, 255, l1, l1, l1, 255]
when 4
[v[0], v[0], v[0], v[2], v[1], v[1], v[1], v[3]]
when 5
v[1], v[0] = bit_transfer_signed(v[1], v[0])
v[3], v[2] = bit_transfer_signed(v[3], v[2])
[v[0], v[0], v[0], v[2], v[0] + v[1], v[0] + v[1], v[0] + v[1], v[2] + v[3]].map{|i| i.clamp(0, 255)}
when 6
[v[0] * v[3] >> 8, v[1] * v[3] >> 8, v[2] * v[3] >> 8, 255, v[0], v[1], v[2], 255]
when 8
if v[0] + v[2] + v[4] <= v[1] + v[3] + v[5]
[v[0], v[2], v[4], 255, v[1], v[3], v[5], 255]
else
blue_contract(v[1], v[3], v[5], 255, v[0], v[2], v[4], 255)
end
when 9
v[1], v[0] = bit_transfer_signed(v[1], v[0])
v[3], v[2] = bit_transfer_signed(v[3], v[2])
v[5], v[4] = bit_transfer_signed(v[5], v[4])
if v[1] + v[3] + v[5] >= 0
[v[0], v[2], v[4], 255, v[0] + v[1], v[2] + v[3], v[4] + v[5], 255].map{|i| i.clamp(0, 255)}
else
blue_contract(v[0] + v[1], v[2] + v[3], v[4] + v[5], 255, v[0], v[2], v[4], 255).map{|i| i.clamp(0, 255)}
end
when 10
[v[0] * v[3] >> 8, v[1] * v[3] >> 8, v[2] * v[3] >> 8, v[4], v[0], v[1], v[2], v[5]]
when 12
if v[0] + v[2] + v[4] <= v[1] + v[3] + v[5]
[v[0], v[2], v[4], v[6], v[1], v[3], v[5], v[7]]
else
blue_contract(v[1], v[3], v[5], v[7], v[0], v[2], v[4], v[6])
end
when 13
v[1], v[0] = bit_transfer_signed(v[1], v[0])
v[3], v[2] = bit_transfer_signed(v[3], v[2])
v[5], v[4] = bit_transfer_signed(v[5], v[4])
v[7], v[6] = bit_transfer_signed(v[7], v[6])
if v[1] + v[3] + v[5] >= 0
[v[0], v[2], v[4], v[6], v[0] + v[1], v[2] + v[3], v[4] + v[5], v[6] + v[7]].map{|i| i.clamp(0, 255)}
else
blue_contract(v[0] + v[1], v[2] + v[3], v[4] + v[5], v[6] + v[7], v[0], v[2], v[4], v[6]).map{|i| i.clamp(0, 255)}
end
else
throw NotImplementedError.new("HDR image is not supported. (CEM: #{cem})")
end
end
end
def bit_transfer_signed(a, b)
b = (b >> 1) | (a & 0x80)
a = (a >> 1) & 0x3f
[a[5] == 1 ? a - 0x40 : a, b]
end
def blue_contract(r1, g1, b1, a1, r2, g2, b2, a2)
[(r1 + b1) >> 1, (g1 + b1) >> 1, b1, a1, (r2 + b2) >> 1, (g2 + b2) >> 1, b2, a2]
end
def decode_weights
data = (0...(@weight_bit + 7) / 8).map{|i| (((self[120 - i * 8, 8]) * 0x80200802) & 0x0884422110) * 0x0101010101 >> 32 & 0xff}
.map.with_index{|e, i| e << i * 8}.inject(:|) & (1 << @weight_bit) - 1
weight_point = decode_intseq_raw(data, WeightPrecTableA[@weight_range], WeightPrecTableB[@weight_range], @weight_num).map do |e|
unquantize_weight(WeightPrecTableA[@weight_range], WeightPrecTableB[@weight_range], e[0], e[1])
end
ds = (1024 + @bw / 2) / (@bw - 1)
dt = (1024 + @bh / 2) / (@bh - 1)
if @dual_plane
@weight0 = Fiddle::Pointer.malloc(@bw * @bh)
@weight1 = Fiddle::Pointer.malloc(@bw * @bh)
for t in 0...@bh
for s in 0...@bw
gs = (ds * s * (@width - 1) + 32) >> 6
gt = (dt * t * (@height - 1) + 32) >> 6
fs = gs & 0xf
ft = gt & 0xf
v = (gs >> 4) + (gt >> 4) * @width
w11 = (fs * ft + 8) >> 4
w10 = ft - w11
w01 = fs - w11
w00 = 16 - fs - ft + w11
p00 = weight_point[v * 2] || 0
p01 = weight_point[(v + 1) * 2] || 0
p10 = weight_point[(v + @width) * 2] || 0
p11 = weight_point[(v + @width + 1) * 2] || 0
@weight0[s + t * @bw] = (p00 * w00 + p01 * w01 + p10 * w10 + p11 * w11 + 8) >> 4
p00 = weight_point[v * 2 + 1] || 0
p01 = weight_point[(v + 1) * 2 + 1] || 0
p10 = weight_point[(v + @width) * 2 + 1] || 0
p11 = weight_point[(v + @width + 1) * 2 + 1] || 0
@weight1[s + t * @bw] = (p00 * w00 + p01 * w01 + p10 * w10 + p11 * w11 + 8) >> 4
end
end
else
@weight = Fiddle::Pointer.malloc(@bw * @bh)
for t in 0...@bh
for s in 0...@bw
gs = (ds * s * (@width - 1) + 32) >> 6
gt = (dt * t * (@height - 1) + 32) >> 6
fs = gs & 0xf
ft = gt & 0xf
v = (gs >> 4) + (gt >> 4) * @width
w11 = (fs * ft + 8) >> 4
p00 = weight_point[v] || 0
p01 = weight_point[v + 1] || 0
p10 = weight_point[v + @width] || 0
p11 = weight_point[v + @width + 1] || 0
@weight[s + t * @bw] = (p00 * (16 - fs - ft + w11) + p01 * (fs - w11) + p10 * (ft - w11) + p11 * w11 + 8) >> 4
end
end
end
end
def select_partition
if @part_num > 1
small_block = @bw * @bh < 31
seed = (@d2 >> 13 & 0x3ff) | ((@part_num - 1) << 10)
rnum = seed
rnum ^= (rnum >> 15)
rnum = (rnum - (rnum << 17)) & 0xffffffff
rnum = (rnum + (rnum << 7)) & 0xffffffff
rnum = (rnum + (rnum << 4)) & 0xffffffff
rnum ^= rnum >> 5
rnum = (rnum + (rnum << 16)) & 0xffffffff
rnum ^= rnum >> 7
rnum ^= rnum >> 3
rnum = (rnum ^ (rnum << 6)) & 0xffffffff
rnum = rnum ^ (rnum >> 17)
seeds = [0, 4, 8, 12, 16, 20, 24, 28].map{|i| (rnum >> i) & 0xf}.map!{|e| e * e}
sh = [seed & 2 == 2 ? 4 : 5, @part_num == 3 ? 6 : 5]
sh.reverse! if seed & 1 == 0
seeds.map!.with_index{|e, i| e >> sh[i % 2]}
@partition = Array.new(@bw * @bh)
for y in 0...@bh
for x in 0...@bw
idx = x + y * @bw
if small_block
x <<= 1
y <<= 1
end
a = (seeds[0] * x + seeds[1] * y + (rnum >> 14)) & 0x3f
b = (seeds[2] * x + seeds[3] * y + (rnum >> 10)) & 0x3f
c = @part_num < 3 ? 0 : (seeds[4] * x + seeds[5] * y + (rnum >> 6)) & 0x3f
d = @part_num < 4 ? 0 : (seeds[6] * x + seeds[7] * y + (rnum >> 2)) & 0x3f
@partition[idx] = 3 - [d, c, b, a].each_with_index.max[1]
end
end
end
end
def applicate_color
mem = Fiddle::Pointer.malloc(@bw * @bh * 4)
if @dual_plane
plane_arr = [0, 1, 2, 3]
plane_arr.delete_at(@plane_selector)
if @partition
(@bw * @bh).times do |i|
part = @partition[i]
plane_arr.each{|c| mem[i * 4 + c] = select_color(@endpoint[part][c], @endpoint[part][4 + c], @weight0[i])}
mem[i * 4 + @plane_selector] = select_color(@endpoint[part][@plane_selector], @endpoint[part][4 + @plane_selector], @weight1[i])
end
else
(@bw * @bh).times do |i|
plane_arr.each{|c| mem[i * 4 + c] = select_color(@endpoint[0][c], @endpoint[0][4 + c], @weight0[i])}
mem[i * 4 + @plane_selector] = select_color(@endpoint[0][@plane_selector], @endpoint[0][4 + @plane_selector], @weight1[i])
end
end
elsif @partition
(@bw * @bh).times do |i|
part = @partition[i]
4.times{|c| mem[i * 4 + c] = select_color(@endpoint[part][c], @endpoint[part][4 + c], @weight[i])}
end
else
(@bw * @bh).times do |i|
4.times{|c| mem[i * 4 + c] = select_color(@endpoint[0][c], @endpoint[0][4 + c], @weight[i])}
end
end
@data = mem.to_str
end
def select_color(v0, v1, weight)
v0 |= v0 << 8
v1 |= v1 << 8
v = (v0 * (64 - weight) + v1 * weight + 32) >> 6
(v * 255 + 32768) / 65536
end
def decode_intseq_raw(data, a, b, count)
mask = (1 << b) - 1
case a
when 3
rc = (count + 4) / 5
ret = Array.new(rc * 5)
m = [0, 2 + b, 4 + b * 2, 5 + b * 3, 7 + b * 4]
rc.times do |i|
t = (data >> b & 3) | (data >> b * 2 & 0xc) | (data >> b * 3 & 0x10) | (data >> b * 4 & 0x60) | (data >> b * 5 & 0x80)
5.times do |j|
ret[i * 5 + j] = [data >> m[j] & mask, TritsTable[j][t]]
end
data >>= b * 5 + 8
end
ret[0, count]
when 5
rc = (count + 2) / 3
ret = Array.new(rc * 3)
m = [0, 3 + b, 5 + b * 2]
rc.times do |i|
q = (data >> b & 7) | (data >> b * 2 & 0x18) | (data >> b * 3 & 0x60)
3.times do |j|
ret[i * 3 + j] = [data >> m[j] & mask, QuintsTable[j][q]]
end
data >>= b * 3 + 7
end
ret[0, count]
else # 0
(0...count).map do |i|
[data >> b * i & mask, 0]
end
end
end
def unquantize_endpoint(a, b, bit, val_d)
if a == 0
case b
when 1
bit * 0xff
when 2
bit * 0x55
when 3
bit << 5 | bit << 2 | bit >> 1
when 4
bit << 4 | bit
when 5
bit << 3 | bit >> 2
when 6
bit << 2 | bit >> 4
when 7
bit << 1 | bit >> 6
else # 8
bit
end
else
val_a = (bit & 1) * 0x1ff
tmp_b = bit >> 1
case b
when 1
val_b = 0
val_c = a == 3 ? 204 : 113
when 2
val_b = a == 3 ? (0b100010110) * tmp_b : (0b100001100) * tmp_b
val_c = a == 3 ? 93 : 54
when 3
val_b = a == 3 ? tmp_b << 7 | tmp_b << 2 | tmp_b : tmp_b << 7 | tmp_b << 1 | tmp_b >> 1
val_c = a == 3 ? 44 : 26
when 4
val_b = tmp_b << 6 | tmp_b >> (a == 3 ? 0 : 1)
val_c = a == 3 ? 22 : 13
when 5
val_b = tmp_b << 5 | tmp_b >> (a == 3 ? 2 : 3)
val_c = a == 3 ? 11 : 6
else # 6
val_b = tmp_b << 4 | tmp_b >> 4
val_c = 5
end
t = val_d * val_c + val_b
t ^= val_a
(val_a & 0x80) | (t >> 2)
end
end
def unquantize_weight(a, b, bit, val_d)
if a == 0
case b
when 1
t = bit == 1 ? 63 : 0
when 2
t = bit << 4 | bit << 2 | bit
when 3
t = bit << 3 | bit
when 4
t = bit << 2 | bit >> 2
else # 5
t = bit << 1 | bit >> 4
end
elsif b == 0
t = (a == 3 ? [0, 32, 63] : [0, 16, 32, 47, 63])[val_d]
else
val_a = (bit & 1) * 0x7f
case b
when 1
val_b = 0
val_c = a == 3 ? 50 : 28
when 2
val_b = (a == 3 ? 0b1000101 : 0b1000010) * bit[1]
val_c = a == 3 ? 23 : 13
else # 3
val_b = (bit << 4 | bit >> 1) & 0b1100011
val_c = 11
end
t = val_d * val_c + val_b
t ^= val_a
t = (val_a & 0x20) | (t >> 2)
end
t > 32 ? t + 1 : t
end
end
end
end
+191 -11
View File
@@ -1,6 +1,7 @@
begin; require 'oily_png'; rescue LoadError; require 'chunky_png'; end
require 'bin_utils'
require 'fiddle'
require 'mikunyan/decoders/astc_block_decoder'
module Mikunyan
# Class for image decoding tools
@@ -29,11 +30,11 @@ module Mikunyan
when 2
decode_argb4444(width, height, bin, endian)
when 3
decode_rgb888(width, height, bin)
decode_rgb24(width, height, bin)
when 4
decode_rgba8888(width, height, bin)
decode_rgba32(width, height, bin)
when 5
decode_argb8888(width, height, bin)
decode_argb32(width, height, bin)
when 7
decode_rgb565(width, height, bin, endian)
when 9
@@ -41,7 +42,7 @@ module Mikunyan
when 13
decode_rgba4444(width, height, bin, endian)
when 14
decode_bgra8888(width, height, bin)
decode_bgra32(width, height, bin)
when 15
decode_rhalf(width, height, bin, endian)
when 16
@@ -58,6 +59,22 @@ module Mikunyan
decode_rgb9e5float(width, height, bin, endian)
when 34
decode_etc1(width, height, bin)
when 45
decode_etc2rgb(width, height, bin)
when 47
decode_etc2rgba8(width, height, bin)
when 48, 54
decode_astc(width, height, 4, bin)
when 49, 55
decode_astc(width, height, 5, bin)
when 50, 56
decode_astc(width, height, 6, bin)
when 51, 57
decode_astc(width, height, 8, bin)
when 52, 58
decode_astc(width, height, 10, bin)
when 53, 59
decode_astc(width, height, 12, bin)
when 62
decode_rg16(width, height, bin)
when 63
@@ -342,16 +359,72 @@ module Mikunyan
def self.decode_etc1(width, height, bin)
bw = (width + 3) / 4
bh = (height + 3) / 4
mem = Fiddle::Pointer.malloc(bw * bh * 48)
ret = ChunkyPNG::Image.new(bw * 4, bh * 4)
bh.times do |by|
bw.times do |bx|
block = decode_etc1_block(BinUtils.get_sint64_be(bin, (bx + by * bw) * 8))
ret.replace!(ChunkyPNG::Image.from_rgb_stream(4, 4, block), bx * 4, by * 4)
end
end
ret.crop(0, 0, width, height)
end
# Decode image from ETC2 compressed binary
# @param [Integer] width image width
# @param [Integer] height image height
# @param [String] bin binary to decode
# @return [ChunkyPNG::Image] decoded image
def self.decode_etc2rgb(width, height, bin)
bw = (width + 3) / 4
bh = (height + 3) / 4
ret = ChunkyPNG::Image.new(bw * 4, bh * 4)
bh.times do |by|
bw.times do |bx|
block = decode_etc2_block(BinUtils.get_sint64_be(bin, (bx + by * bw) * 8))
ret.replace!(ChunkyPNG::Image.from_rgb_stream(4, 4, block), bx * 4, by * 4)
end
end
ret.crop(0, 0, width, height)
end
# Decode image from ETC2 Alpha8 compressed binary
# @param [Integer] width image width
# @param [Integer] height image height
# @param [String] bin binary to decode
# @return [ChunkyPNG::Image] decoded image
def self.decode_etc2rgba8(width, height, bin)
bw = (width + 3) / 4
bh = (height + 3) / 4
mem = Fiddle::Pointer.malloc(bw * bh * 64)
bh.times do |by|
bw.times do |bx|
alpha = decode_etc2alpha_block(BinUtils.get_int64_be(bin, (bx + by * bw) * 16))
block = decode_etc2_block(BinUtils.get_int64_be(bin, (bx + by * bw) * 16 + 8))
16.times do |i|
mem[((i / 4 + bx * 4) + (i % 4 + by * 4) * bw * 4) * 3, 3] = block[i]
mem[((i / 4 + bx * 4) + (i % 4 + by * 4) * bw * 4) * 4, 4] = block[i] + alpha[i]
end
end
end
ChunkyPNG::Image.from_rgb_stream(bw * 4, bh * 4, mem.to_str).crop!(0, 0, width, height)
ChunkyPNG::Image.from_rgba_stream(bw * 4, bh * 4, mem.to_str).crop(0, 0, width, height)
end
# Decode image from ASTC compressed binary
# @param [Integer] width image width
# @param [Integer] height image height
# @param [Integer] blocksize block size
# @param [String] bin binary to decode
# @return [ChunkyPNG::Image] decoded image
def self.decode_astc(width, height, blocksize, bin)
bw = (width + blocksize - 1) / blocksize
bh = (height + blocksize - 1) / blocksize
ret = ChunkyPNG::Image.new(bw * blocksize, bh * blocksize)
bh.times do |by|
bw.times do |bx|
block = DecodeHelper::AstcBlockDecoder.new(bin.byteslice((by * bw + bx) * 16, 16), blocksize, blocksize).data
ret.replace!(ChunkyPNG::Image.from_rgba_stream(blocksize, blocksize, block), bx * blocksize, by * blocksize)
end
end
ret.crop(0, 0, width, height).flip
end
# Create ASTC file data from ObjectValue
@@ -386,6 +459,25 @@ module Mikunyan
Etc1ModifierTable = [[2, 8], [5, 17], [9, 29], [13, 42], [18, 60], [24, 80], [33, 106], [47, 183]]
Etc1SubblockTable = [[0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1], [0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1]]
Etc2DistanceTable = [3, 6, 11, 16, 23, 32, 41, 64]
Etc2AlphaModTable = [
[-3, -6, -9, -15, 2, 5, 8, 14],
[-3, -7, -10, -13, 2, 6, 9, 12],
[-2, -5, -8, -13, 1, 4, 7, 12],
[-2, -4, -6, -13, 1, 3, 5, 12],
[-3, -6, -8, -12, 2, 5, 7, 11],
[-3, -7, -9, -11, 2, 6, 8, 10],
[-4, -7, -8, -11, 3, 6, 7, 10],
[-3, -5, -8, -11, 2, 4, 7, 10],
[-2, -6, -8, -10, 1, 5, 7, 9],
[-2, -5, -8, -10, 1, 4, 7, 9],
[-2, -4, -8, -10, 1, 3, 7, 9],
[-2, -5, -7, -10, 1, 4, 6, 9],
[-3, -4, -7, -10, 2, 3, 6, 9],
[-1, -2, -3, -10, 0, 1, 2, 9],
[-4, -6, -8, -9, 3, 5, 7, 8],
[-3, -5, -7, -9, 2, 4, 6, 8]
]
def self.decode_etc1_block(bin)
colors = []
@@ -406,12 +498,10 @@ module Mikunyan
colors[1] = colors[1] | (colors[1] >> 5 & 0x70707)
end
ret = Array.new(16, 0)
16.times do |i|
(0...16).map do |i|
modifier = Etc1ModifierTable[codes[subblocks[i]]][bin[i]]
ret[i] = etc1colormod(colors[subblocks[i]], bin[i + 16] == 0 ? modifier : -modifier)
etc1colormod(colors[subblocks[i]], bin[i + 16] == 0 ? modifier : -modifier)
end
ret
end
def self.etc1colormod(color, modifier)
@@ -421,6 +511,96 @@ module Mikunyan
r.clamp(0, 255).chr + g.clamp(0, 255).chr + b.clamp(0, 255).chr
end
def self.decode_etc2_block(bin)
if bin[33] == 0
# individual
colors = [0, 0]
colors[0] = bin >> 40 & 0xf0f0f0
colors[0] = colors[0] | colors[0] >> 4
colors[1] = bin >> 36 & 0xf0f0f0
colors[1] = colors[1] | colors[1] >> 4
codes = [bin >> 37 & 7, bin >> 34 & 7]
subblocks = Etc1SubblockTable[bin[32]]
(0...16).map do |i|
modifier = Etc1ModifierTable[codes[subblocks[i]]][bin[i]]
etc1colormod(colors[subblocks[i]], bin[i + 16] == 0 ? modifier : -modifier)
end
else
r = bin >> 59
dr = (bin >> 56 & 3) - (bin >> 56 & 4)
g = bin >> 51 & 0x1f
dg = (bin >> 48 & 3) - (bin >> 48 & 4)
b = bin >> 43 & 0x1f
db = (bin >> 40 & 3) - (bin >> 40 & 4)
if r + dr < 0 || r + dr > 31
# T mode
base1 = (bin >> 49 & 0xc00) | (bin >> 48 & 0x3ff)
base1 = (base1 & 0xf00) << 8 | (base1 & 0xf0) << 4 | (base1 & 0xf)
base1 = (base1 << 4) | base1
base2 = bin >> 36 & 0xfff
base2 = (base2 & 0xf00) << 8 | (base2 & 0xf0) << 4 | (base2 & 0xf)
base2 = (base2 << 4) | base2
d = Etc2DistanceTable[(bin >> 33 & 6) + bin[32]]
colors = [[base1].pack('N')[1,3], etc1colormod(base2, d), [base2].pack('N')[1,3], etc1colormod(base2, -d)]
(0...16).map{|i| colors[bin[i] + bin[i + 16] * 2]}
elsif g + dg < 0 || g + dg > 31
# H mode
base1 = (bin >> 51 & 0xfe0) | (bin >> 48 & 0x18) | (bin >> 47 & 7)
base1 = (base1 & 0xf00) << 8 | (base1 & 0xf0) << 4 | (base1 & 0xf)
base1 = (base1 << 4) | base1
base2 = bin >> 35 & 0xfff
base2 = (base2 & 0xf00) << 8 | (base2 & 0xf0) << 4 | (base2 & 0xf)
base2 = (base2 << 4) | base2
d = Etc2DistanceTable[bin[34] * 2 + bin[32]]
colors = [etc1colormod(base1, d), etc1colormod(base1, -d), etc1colormod(base2, d), etc1colormod(base2, -d)]
(0...16).map{|i| colors[bin[i] + bin[i + 16] * 2]}
elsif b + db < 0 || b + db > 31
# planar mode
color_or = (bin >> 55 & 0xfc) | (bin >> 61 & 0x03)
color_og = (bin >> 49 & 0x80) | (bin >> 48 & 0x7e) | bin[56]
color_ob = (bin >> 41 & 0x80) | (bin >> 38 & 0x60) | (bin >> 37 & 0x1c) | (bin >> 47 & 2) | bin[44]
color_hr = (bin >> 31 & 0xf8) | (bin >> 30 & 0x04) | (bin >> 37 & 0x03)
color_hg = (bin >> 24 & 0xfe) | bin[31]
color_hb = (bin >> 17 & 0xfc) | (bin >> 23 & 0x03)
color_vr = (bin >> 11 & 0xfc) | (bin >> 17 & 0x03)
color_vg = (bin >> 5 & 0xfe) | bin[12]
color_vb = (bin << 2 & 0xfc) | (bin >> 4 & 0x03)
(0...16).map do |i|
x = i / 4
y = i % 4
r = (x * (color_hr - color_or) + y * (color_vr - color_or) + 4 * color_or + 2) >> 2
g = (x * (color_hg - color_og) + y * (color_vg - color_og) + 4 * color_og + 2) >> 2
b = (x * (color_hb - color_ob) + y * (color_vb - color_ob) + 4 * color_ob + 2) >> 2
r.clamp(0, 255).chr + g.clamp(0, 255).chr + b.clamp(0, 255).chr
end
else
# differential mode
colors = [0, 0]
colors[0] = bin >> 40 & 0xf8f8f8
colors[1] = colors[0] + (dr << 19) + (dg << 11) + (db << 3)
colors[0] = colors[0] | (colors[0] >> 5 & 0x70707)
colors[1] = colors[1] | (colors[1] >> 5 & 0x70707)
codes = [bin >> 37 & 7, bin >> 34 & 7]
subblocks = Etc1SubblockTable[bin[32]]
(0...16).map do |i|
modifier = Etc1ModifierTable[codes[subblocks[i]]][bin[i]]
etc1colormod(colors[subblocks[i]], bin[i + 16] == 0 ? modifier : -modifier)
end
end
end
end
def self.decode_etc2alpha_block(bin)
if bin & 0xf0000000000000 == 0
Array.new(16, (bin >> 56).chr)
else
base = bin >> 56
mult = bin >> 52 & 0xf
table = Etc2AlphaModTable[bin >> 48 & 0xf]
(0...16).map{|i| (base + table[bin >> i*3 & 7] * mult).clamp(0, 255).chr}
end
end
# convert 16bit float
def self.n2f(n)
case n
+1 -1
View File
@@ -1,4 +1,4 @@
module Mikunyan
# version string
VERSION = "3.9.1"
VERSION = "3.9.2"
end