mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 16:47:28 +01:00
std/jpeg: remove decode_idct block-selector arg
name old speed new speed delta wuffs_jpeg_decode_19k_8bpp/clang11 210MB/s ± 0% 213MB/s ± 0% +1.54% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/clang11 200MB/s ± 0% 197MB/s ± 0% -1.31% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/clang11 362MB/s ± 0% 373MB/s ± 0% +3.04% (p=0.008 n=5+5) wuffs_jpeg_decode_77k_24bpp/clang11 307MB/s ± 0% 318MB/s ± 0% +3.82% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/clang11 318MB/s ± 0% 331MB/s ± 0% +4.09% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/clang11 434MB/s ± 0% 440MB/s ± 0% +1.34% (p=0.016 n=4+5) wuffs_jpeg_decode_4002k_24bpp/clang11 320MB/s ± 0% 340MB/s ± 0% +6.29% (p=0.008 n=5+5) wuffs_jpeg_decode_19k_8bpp/gcc10 165MB/s ± 0% 172MB/s ± 0% +4.32% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/gcc10 224MB/s ± 0% 227MB/s ± 0% +1.30% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/gcc10 454MB/s ± 0% 465MB/s ± 0% +2.40% (p=0.008 n=5+5) wuffs_jpeg_decode_77k_24bpp/gcc10 311MB/s ± 0% 324MB/s ± 0% +4.38% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/gcc10 327MB/s ± 0% 342MB/s ± 0% +4.52% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/gcc10 384MB/s ± 0% 393MB/s ± 0% +2.34% (p=0.008 n=5+5) wuffs_jpeg_decode_4002k_24bpp/gcc10 324MB/s ± 0% 345MB/s ± 1% +6.26% (p=0.008 n=5+5)
This commit is contained in:
1 parent
d248ade0e6
commit
c0d7d7d046
9 files changed
+381
-359
No files matched your search
+129
-129
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b: base.u32[..= 9], q: base.u32[..= 3]) {
|
||||
pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, q: base.u32[..= 3]) {
|
||||
// This method implements the same algorithm as libjpeg-turbo's jidctint.c.
|
||||
|
||||
var bq0 : base.u32
|
||||
@@ -120,17 +120,17 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
// ==== First pass, column 0.
|
||||
|
||||
if (0 == (
|
||||
this.mcu_blocks[args.b][0x08] |
|
||||
this.mcu_blocks[args.b][0x10] |
|
||||
this.mcu_blocks[args.b][0x18] |
|
||||
this.mcu_blocks[args.b][0x20] |
|
||||
this.mcu_blocks[args.b][0x28] |
|
||||
this.mcu_blocks[args.b][0x30] |
|
||||
this.mcu_blocks[args.b][0x38])) {
|
||||
this.mcu_blocks[0][0x08] |
|
||||
this.mcu_blocks[0][0x10] |
|
||||
this.mcu_blocks[0][0x18] |
|
||||
this.mcu_blocks[0][0x20] |
|
||||
this.mcu_blocks[0][0x28] |
|
||||
this.mcu_blocks[0][0x30] |
|
||||
this.mcu_blocks[0][0x38])) {
|
||||
// Fast path when the 1-dimensional AC terms are all zero.
|
||||
|
||||
intermediate[0x00] =
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x00]) ~mod*
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x00]) ~mod*
|
||||
(this.quant_tables[args.q][0x00] as base.u32)) ~mod<< 2
|
||||
intermediate[0x08] = intermediate[0x00]
|
||||
intermediate[0x10] = intermediate[0x00]
|
||||
@@ -143,16 +143,16 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
} else {
|
||||
// Even rows.
|
||||
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x10]) ~mod* (this.quant_tables[args.q][0x10] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x30]) ~mod* (this.quant_tables[args.q][0x30] as base.u32)
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x10]) ~mod* (this.quant_tables[args.q][0x10] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x30]) ~mod* (this.quant_tables[args.q][0x30] as base.u32)
|
||||
|
||||
ca = (bq2 ~mod+ bq6) ~mod* 0x1151
|
||||
|
||||
cb2 = ca ~mod+ (bq2 ~mod* 0x187E)
|
||||
cb6 = ca ~mod- (bq6 ~mod* 0x3B21)
|
||||
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x00]) ~mod* (this.quant_tables[args.q][0x00] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x20]) ~mod* (this.quant_tables[args.q][0x20] as base.u32)
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x00]) ~mod* (this.quant_tables[args.q][0x00] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x20]) ~mod* (this.quant_tables[args.q][0x20] as base.u32)
|
||||
|
||||
ccp = (bq0 ~mod+ bq4) ~mod<< 13
|
||||
ccm = (bq0 ~mod- bq4) ~mod<< 13
|
||||
@@ -164,10 +164,10 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
|
||||
// Odd rows.
|
||||
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x08]) ~mod* (this.quant_tables[args.q][0x08] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x18]) ~mod* (this.quant_tables[args.q][0x18] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x28]) ~mod* (this.quant_tables[args.q][0x28] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x38]) ~mod* (this.quant_tables[args.q][0x38] as base.u32)
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x08]) ~mod* (this.quant_tables[args.q][0x08] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x18]) ~mod* (this.quant_tables[args.q][0x18] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x28]) ~mod* (this.quant_tables[args.q][0x28] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x38]) ~mod* (this.quant_tables[args.q][0x38] as base.u32)
|
||||
|
||||
ci51 = bq5 ~mod+ bq1
|
||||
ci53 = bq5 ~mod+ bq3
|
||||
@@ -209,17 +209,17 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
// ==== First pass, column 1.
|
||||
|
||||
if (0 == (
|
||||
this.mcu_blocks[args.b][0x09] |
|
||||
this.mcu_blocks[args.b][0x11] |
|
||||
this.mcu_blocks[args.b][0x19] |
|
||||
this.mcu_blocks[args.b][0x21] |
|
||||
this.mcu_blocks[args.b][0x29] |
|
||||
this.mcu_blocks[args.b][0x31] |
|
||||
this.mcu_blocks[args.b][0x39])) {
|
||||
this.mcu_blocks[0][0x09] |
|
||||
this.mcu_blocks[0][0x11] |
|
||||
this.mcu_blocks[0][0x19] |
|
||||
this.mcu_blocks[0][0x21] |
|
||||
this.mcu_blocks[0][0x29] |
|
||||
this.mcu_blocks[0][0x31] |
|
||||
this.mcu_blocks[0][0x39])) {
|
||||
// Fast path when the 1-dimensional AC terms are all zero.
|
||||
|
||||
intermediate[0x01] =
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x01]) ~mod*
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x01]) ~mod*
|
||||
(this.quant_tables[args.q][0x01] as base.u32)) ~mod<< 2
|
||||
intermediate[0x09] = intermediate[0x01]
|
||||
intermediate[0x11] = intermediate[0x01]
|
||||
@@ -232,16 +232,16 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
} else {
|
||||
// Even rows.
|
||||
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x11]) ~mod* (this.quant_tables[args.q][0x11] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x31]) ~mod* (this.quant_tables[args.q][0x31] as base.u32)
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x11]) ~mod* (this.quant_tables[args.q][0x11] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x31]) ~mod* (this.quant_tables[args.q][0x31] as base.u32)
|
||||
|
||||
ca = (bq2 ~mod+ bq6) ~mod* 0x1151
|
||||
|
||||
cb2 = ca ~mod+ (bq2 ~mod* 0x187E)
|
||||
cb6 = ca ~mod- (bq6 ~mod* 0x3B21)
|
||||
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x01]) ~mod* (this.quant_tables[args.q][0x01] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x21]) ~mod* (this.quant_tables[args.q][0x21] as base.u32)
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x01]) ~mod* (this.quant_tables[args.q][0x01] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x21]) ~mod* (this.quant_tables[args.q][0x21] as base.u32)
|
||||
|
||||
ccp = (bq0 ~mod+ bq4) ~mod<< 13
|
||||
ccm = (bq0 ~mod- bq4) ~mod<< 13
|
||||
@@ -253,10 +253,10 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
|
||||
// Odd rows.
|
||||
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x09]) ~mod* (this.quant_tables[args.q][0x09] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x19]) ~mod* (this.quant_tables[args.q][0x19] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x29]) ~mod* (this.quant_tables[args.q][0x29] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x39]) ~mod* (this.quant_tables[args.q][0x39] as base.u32)
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x09]) ~mod* (this.quant_tables[args.q][0x09] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x19]) ~mod* (this.quant_tables[args.q][0x19] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x29]) ~mod* (this.quant_tables[args.q][0x29] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x39]) ~mod* (this.quant_tables[args.q][0x39] as base.u32)
|
||||
|
||||
ci51 = bq5 ~mod+ bq1
|
||||
ci53 = bq5 ~mod+ bq3
|
||||
@@ -298,17 +298,17 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
// ==== First pass, column 2.
|
||||
|
||||
if (0 == (
|
||||
this.mcu_blocks[args.b][0x0A] |
|
||||
this.mcu_blocks[args.b][0x12] |
|
||||
this.mcu_blocks[args.b][0x1A] |
|
||||
this.mcu_blocks[args.b][0x22] |
|
||||
this.mcu_blocks[args.b][0x2A] |
|
||||
this.mcu_blocks[args.b][0x32] |
|
||||
this.mcu_blocks[args.b][0x3A])) {
|
||||
this.mcu_blocks[0][0x0A] |
|
||||
this.mcu_blocks[0][0x12] |
|
||||
this.mcu_blocks[0][0x1A] |
|
||||
this.mcu_blocks[0][0x22] |
|
||||
this.mcu_blocks[0][0x2A] |
|
||||
this.mcu_blocks[0][0x32] |
|
||||
this.mcu_blocks[0][0x3A])) {
|
||||
// Fast path when the 1-dimensional AC terms are all zero.
|
||||
|
||||
intermediate[0x02] =
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x02]) ~mod*
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x02]) ~mod*
|
||||
(this.quant_tables[args.q][0x02] as base.u32)) ~mod<< 2
|
||||
intermediate[0x0A] = intermediate[0x02]
|
||||
intermediate[0x12] = intermediate[0x02]
|
||||
@@ -321,16 +321,16 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
} else {
|
||||
// Even rows.
|
||||
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x12]) ~mod* (this.quant_tables[args.q][0x12] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x32]) ~mod* (this.quant_tables[args.q][0x32] as base.u32)
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x12]) ~mod* (this.quant_tables[args.q][0x12] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x32]) ~mod* (this.quant_tables[args.q][0x32] as base.u32)
|
||||
|
||||
ca = (bq2 ~mod+ bq6) ~mod* 0x1151
|
||||
|
||||
cb2 = ca ~mod+ (bq2 ~mod* 0x187E)
|
||||
cb6 = ca ~mod- (bq6 ~mod* 0x3B21)
|
||||
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x02]) ~mod* (this.quant_tables[args.q][0x02] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x22]) ~mod* (this.quant_tables[args.q][0x22] as base.u32)
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x02]) ~mod* (this.quant_tables[args.q][0x02] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x22]) ~mod* (this.quant_tables[args.q][0x22] as base.u32)
|
||||
|
||||
ccp = (bq0 ~mod+ bq4) ~mod<< 13
|
||||
ccm = (bq0 ~mod- bq4) ~mod<< 13
|
||||
@@ -342,10 +342,10 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
|
||||
// Odd rows.
|
||||
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x0A]) ~mod* (this.quant_tables[args.q][0x0A] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x1A]) ~mod* (this.quant_tables[args.q][0x1A] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x2A]) ~mod* (this.quant_tables[args.q][0x2A] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x3A]) ~mod* (this.quant_tables[args.q][0x3A] as base.u32)
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x0A]) ~mod* (this.quant_tables[args.q][0x0A] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x1A]) ~mod* (this.quant_tables[args.q][0x1A] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x2A]) ~mod* (this.quant_tables[args.q][0x2A] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x3A]) ~mod* (this.quant_tables[args.q][0x3A] as base.u32)
|
||||
|
||||
ci51 = bq5 ~mod+ bq1
|
||||
ci53 = bq5 ~mod+ bq3
|
||||
@@ -387,17 +387,17 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
// ==== First pass, column 3.
|
||||
|
||||
if (0 == (
|
||||
this.mcu_blocks[args.b][0x0B] |
|
||||
this.mcu_blocks[args.b][0x13] |
|
||||
this.mcu_blocks[args.b][0x1B] |
|
||||
this.mcu_blocks[args.b][0x23] |
|
||||
this.mcu_blocks[args.b][0x2B] |
|
||||
this.mcu_blocks[args.b][0x33] |
|
||||
this.mcu_blocks[args.b][0x3B])) {
|
||||
this.mcu_blocks[0][0x0B] |
|
||||
this.mcu_blocks[0][0x13] |
|
||||
this.mcu_blocks[0][0x1B] |
|
||||
this.mcu_blocks[0][0x23] |
|
||||
this.mcu_blocks[0][0x2B] |
|
||||
this.mcu_blocks[0][0x33] |
|
||||
this.mcu_blocks[0][0x3B])) {
|
||||
// Fast path when the 1-dimensional AC terms are all zero.
|
||||
|
||||
intermediate[0x03] =
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x03]) ~mod*
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x03]) ~mod*
|
||||
(this.quant_tables[args.q][0x03] as base.u32)) ~mod<< 2
|
||||
intermediate[0x0B] = intermediate[0x03]
|
||||
intermediate[0x13] = intermediate[0x03]
|
||||
@@ -410,16 +410,16 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
} else {
|
||||
// Even rows.
|
||||
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x13]) ~mod* (this.quant_tables[args.q][0x13] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x33]) ~mod* (this.quant_tables[args.q][0x33] as base.u32)
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x13]) ~mod* (this.quant_tables[args.q][0x13] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x33]) ~mod* (this.quant_tables[args.q][0x33] as base.u32)
|
||||
|
||||
ca = (bq2 ~mod+ bq6) ~mod* 0x1151
|
||||
|
||||
cb2 = ca ~mod+ (bq2 ~mod* 0x187E)
|
||||
cb6 = ca ~mod- (bq6 ~mod* 0x3B21)
|
||||
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x03]) ~mod* (this.quant_tables[args.q][0x03] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x23]) ~mod* (this.quant_tables[args.q][0x23] as base.u32)
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x03]) ~mod* (this.quant_tables[args.q][0x03] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x23]) ~mod* (this.quant_tables[args.q][0x23] as base.u32)
|
||||
|
||||
ccp = (bq0 ~mod+ bq4) ~mod<< 13
|
||||
ccm = (bq0 ~mod- bq4) ~mod<< 13
|
||||
@@ -431,10 +431,10 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
|
||||
// Odd rows.
|
||||
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x0B]) ~mod* (this.quant_tables[args.q][0x0B] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x1B]) ~mod* (this.quant_tables[args.q][0x1B] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x2B]) ~mod* (this.quant_tables[args.q][0x2B] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x3B]) ~mod* (this.quant_tables[args.q][0x3B] as base.u32)
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x0B]) ~mod* (this.quant_tables[args.q][0x0B] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x1B]) ~mod* (this.quant_tables[args.q][0x1B] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x2B]) ~mod* (this.quant_tables[args.q][0x2B] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x3B]) ~mod* (this.quant_tables[args.q][0x3B] as base.u32)
|
||||
|
||||
ci51 = bq5 ~mod+ bq1
|
||||
ci53 = bq5 ~mod+ bq3
|
||||
@@ -476,17 +476,17 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
// ==== First pass, column 4.
|
||||
|
||||
if (0 == (
|
||||
this.mcu_blocks[args.b][0x0C] |
|
||||
this.mcu_blocks[args.b][0x14] |
|
||||
this.mcu_blocks[args.b][0x1C] |
|
||||
this.mcu_blocks[args.b][0x24] |
|
||||
this.mcu_blocks[args.b][0x2C] |
|
||||
this.mcu_blocks[args.b][0x34] |
|
||||
this.mcu_blocks[args.b][0x3C])) {
|
||||
this.mcu_blocks[0][0x0C] |
|
||||
this.mcu_blocks[0][0x14] |
|
||||
this.mcu_blocks[0][0x1C] |
|
||||
this.mcu_blocks[0][0x24] |
|
||||
this.mcu_blocks[0][0x2C] |
|
||||
this.mcu_blocks[0][0x34] |
|
||||
this.mcu_blocks[0][0x3C])) {
|
||||
// Fast path when the 1-dimensional AC terms are all zero.
|
||||
|
||||
intermediate[0x04] =
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x04]) ~mod*
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x04]) ~mod*
|
||||
(this.quant_tables[args.q][0x04] as base.u32)) ~mod<< 2
|
||||
intermediate[0x0C] = intermediate[0x04]
|
||||
intermediate[0x14] = intermediate[0x04]
|
||||
@@ -499,16 +499,16 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
} else {
|
||||
// Even rows.
|
||||
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x14]) ~mod* (this.quant_tables[args.q][0x14] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x34]) ~mod* (this.quant_tables[args.q][0x34] as base.u32)
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x14]) ~mod* (this.quant_tables[args.q][0x14] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x34]) ~mod* (this.quant_tables[args.q][0x34] as base.u32)
|
||||
|
||||
ca = (bq2 ~mod+ bq6) ~mod* 0x1151
|
||||
|
||||
cb2 = ca ~mod+ (bq2 ~mod* 0x187E)
|
||||
cb6 = ca ~mod- (bq6 ~mod* 0x3B21)
|
||||
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x04]) ~mod* (this.quant_tables[args.q][0x04] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x24]) ~mod* (this.quant_tables[args.q][0x24] as base.u32)
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x04]) ~mod* (this.quant_tables[args.q][0x04] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x24]) ~mod* (this.quant_tables[args.q][0x24] as base.u32)
|
||||
|
||||
ccp = (bq0 ~mod+ bq4) ~mod<< 13
|
||||
ccm = (bq0 ~mod- bq4) ~mod<< 13
|
||||
@@ -520,10 +520,10 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
|
||||
// Odd rows.
|
||||
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x0C]) ~mod* (this.quant_tables[args.q][0x0C] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x1C]) ~mod* (this.quant_tables[args.q][0x1C] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x2C]) ~mod* (this.quant_tables[args.q][0x2C] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x3C]) ~mod* (this.quant_tables[args.q][0x3C] as base.u32)
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x0C]) ~mod* (this.quant_tables[args.q][0x0C] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x1C]) ~mod* (this.quant_tables[args.q][0x1C] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x2C]) ~mod* (this.quant_tables[args.q][0x2C] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x3C]) ~mod* (this.quant_tables[args.q][0x3C] as base.u32)
|
||||
|
||||
ci51 = bq5 ~mod+ bq1
|
||||
ci53 = bq5 ~mod+ bq3
|
||||
@@ -565,17 +565,17 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
// ==== First pass, column 5.
|
||||
|
||||
if (0 == (
|
||||
this.mcu_blocks[args.b][0x0D] |
|
||||
this.mcu_blocks[args.b][0x15] |
|
||||
this.mcu_blocks[args.b][0x1D] |
|
||||
this.mcu_blocks[args.b][0x25] |
|
||||
this.mcu_blocks[args.b][0x2D] |
|
||||
this.mcu_blocks[args.b][0x35] |
|
||||
this.mcu_blocks[args.b][0x3D])) {
|
||||
this.mcu_blocks[0][0x0D] |
|
||||
this.mcu_blocks[0][0x15] |
|
||||
this.mcu_blocks[0][0x1D] |
|
||||
this.mcu_blocks[0][0x25] |
|
||||
this.mcu_blocks[0][0x2D] |
|
||||
this.mcu_blocks[0][0x35] |
|
||||
this.mcu_blocks[0][0x3D])) {
|
||||
// Fast path when the 1-dimensional AC terms are all zero.
|
||||
|
||||
intermediate[0x05] =
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x05]) ~mod*
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x05]) ~mod*
|
||||
(this.quant_tables[args.q][0x05] as base.u32)) ~mod<< 2
|
||||
intermediate[0x0D] = intermediate[0x05]
|
||||
intermediate[0x15] = intermediate[0x05]
|
||||
@@ -588,16 +588,16 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
} else {
|
||||
// Even rows.
|
||||
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x15]) ~mod* (this.quant_tables[args.q][0x15] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x35]) ~mod* (this.quant_tables[args.q][0x35] as base.u32)
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x15]) ~mod* (this.quant_tables[args.q][0x15] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x35]) ~mod* (this.quant_tables[args.q][0x35] as base.u32)
|
||||
|
||||
ca = (bq2 ~mod+ bq6) ~mod* 0x1151
|
||||
|
||||
cb2 = ca ~mod+ (bq2 ~mod* 0x187E)
|
||||
cb6 = ca ~mod- (bq6 ~mod* 0x3B21)
|
||||
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x05]) ~mod* (this.quant_tables[args.q][0x05] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x25]) ~mod* (this.quant_tables[args.q][0x25] as base.u32)
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x05]) ~mod* (this.quant_tables[args.q][0x05] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x25]) ~mod* (this.quant_tables[args.q][0x25] as base.u32)
|
||||
|
||||
ccp = (bq0 ~mod+ bq4) ~mod<< 13
|
||||
ccm = (bq0 ~mod- bq4) ~mod<< 13
|
||||
@@ -609,10 +609,10 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
|
||||
// Odd rows.
|
||||
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x0D]) ~mod* (this.quant_tables[args.q][0x0D] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x1D]) ~mod* (this.quant_tables[args.q][0x1D] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x2D]) ~mod* (this.quant_tables[args.q][0x2D] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x3D]) ~mod* (this.quant_tables[args.q][0x3D] as base.u32)
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x0D]) ~mod* (this.quant_tables[args.q][0x0D] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x1D]) ~mod* (this.quant_tables[args.q][0x1D] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x2D]) ~mod* (this.quant_tables[args.q][0x2D] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x3D]) ~mod* (this.quant_tables[args.q][0x3D] as base.u32)
|
||||
|
||||
ci51 = bq5 ~mod+ bq1
|
||||
ci53 = bq5 ~mod+ bq3
|
||||
@@ -654,17 +654,17 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
// ==== First pass, column 6.
|
||||
|
||||
if (0 == (
|
||||
this.mcu_blocks[args.b][0x0E] |
|
||||
this.mcu_blocks[args.b][0x16] |
|
||||
this.mcu_blocks[args.b][0x1E] |
|
||||
this.mcu_blocks[args.b][0x26] |
|
||||
this.mcu_blocks[args.b][0x2E] |
|
||||
this.mcu_blocks[args.b][0x36] |
|
||||
this.mcu_blocks[args.b][0x3E])) {
|
||||
this.mcu_blocks[0][0x0E] |
|
||||
this.mcu_blocks[0][0x16] |
|
||||
this.mcu_blocks[0][0x1E] |
|
||||
this.mcu_blocks[0][0x26] |
|
||||
this.mcu_blocks[0][0x2E] |
|
||||
this.mcu_blocks[0][0x36] |
|
||||
this.mcu_blocks[0][0x3E])) {
|
||||
// Fast path when the 1-dimensional AC terms are all zero.
|
||||
|
||||
intermediate[0x06] =
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x06]) ~mod*
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x06]) ~mod*
|
||||
(this.quant_tables[args.q][0x06] as base.u32)) ~mod<< 2
|
||||
intermediate[0x0E] = intermediate[0x06]
|
||||
intermediate[0x16] = intermediate[0x06]
|
||||
@@ -677,16 +677,16 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
} else {
|
||||
// Even rows.
|
||||
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x16]) ~mod* (this.quant_tables[args.q][0x16] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x36]) ~mod* (this.quant_tables[args.q][0x36] as base.u32)
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x16]) ~mod* (this.quant_tables[args.q][0x16] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x36]) ~mod* (this.quant_tables[args.q][0x36] as base.u32)
|
||||
|
||||
ca = (bq2 ~mod+ bq6) ~mod* 0x1151
|
||||
|
||||
cb2 = ca ~mod+ (bq2 ~mod* 0x187E)
|
||||
cb6 = ca ~mod- (bq6 ~mod* 0x3B21)
|
||||
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x06]) ~mod* (this.quant_tables[args.q][0x06] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x26]) ~mod* (this.quant_tables[args.q][0x26] as base.u32)
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x06]) ~mod* (this.quant_tables[args.q][0x06] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x26]) ~mod* (this.quant_tables[args.q][0x26] as base.u32)
|
||||
|
||||
ccp = (bq0 ~mod+ bq4) ~mod<< 13
|
||||
ccm = (bq0 ~mod- bq4) ~mod<< 13
|
||||
@@ -698,10 +698,10 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
|
||||
// Odd rows.
|
||||
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x0E]) ~mod* (this.quant_tables[args.q][0x0E] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x1E]) ~mod* (this.quant_tables[args.q][0x1E] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x2E]) ~mod* (this.quant_tables[args.q][0x2E] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x3E]) ~mod* (this.quant_tables[args.q][0x3E] as base.u32)
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x0E]) ~mod* (this.quant_tables[args.q][0x0E] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x1E]) ~mod* (this.quant_tables[args.q][0x1E] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x2E]) ~mod* (this.quant_tables[args.q][0x2E] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x3E]) ~mod* (this.quant_tables[args.q][0x3E] as base.u32)
|
||||
|
||||
ci51 = bq5 ~mod+ bq1
|
||||
ci53 = bq5 ~mod+ bq3
|
||||
@@ -743,17 +743,17 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
// ==== First pass, column 7.
|
||||
|
||||
if (0 == (
|
||||
this.mcu_blocks[args.b][0x0F] |
|
||||
this.mcu_blocks[args.b][0x17] |
|
||||
this.mcu_blocks[args.b][0x1F] |
|
||||
this.mcu_blocks[args.b][0x27] |
|
||||
this.mcu_blocks[args.b][0x2F] |
|
||||
this.mcu_blocks[args.b][0x37] |
|
||||
this.mcu_blocks[args.b][0x3F])) {
|
||||
this.mcu_blocks[0][0x0F] |
|
||||
this.mcu_blocks[0][0x17] |
|
||||
this.mcu_blocks[0][0x1F] |
|
||||
this.mcu_blocks[0][0x27] |
|
||||
this.mcu_blocks[0][0x2F] |
|
||||
this.mcu_blocks[0][0x37] |
|
||||
this.mcu_blocks[0][0x3F])) {
|
||||
// Fast path when the 1-dimensional AC terms are all zero.
|
||||
|
||||
intermediate[0x07] =
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x07]) ~mod*
|
||||
(this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x07]) ~mod*
|
||||
(this.quant_tables[args.q][0x07] as base.u32)) ~mod<< 2
|
||||
intermediate[0x0F] = intermediate[0x07]
|
||||
intermediate[0x17] = intermediate[0x07]
|
||||
@@ -766,16 +766,16 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
} else {
|
||||
// Even rows.
|
||||
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x17]) ~mod* (this.quant_tables[args.q][0x17] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x37]) ~mod* (this.quant_tables[args.q][0x37] as base.u32)
|
||||
bq2 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x17]) ~mod* (this.quant_tables[args.q][0x17] as base.u32)
|
||||
bq6 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x37]) ~mod* (this.quant_tables[args.q][0x37] as base.u32)
|
||||
|
||||
ca = (bq2 ~mod+ bq6) ~mod* 0x1151
|
||||
|
||||
cb2 = ca ~mod+ (bq2 ~mod* 0x187E)
|
||||
cb6 = ca ~mod- (bq6 ~mod* 0x3B21)
|
||||
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x07]) ~mod* (this.quant_tables[args.q][0x07] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x27]) ~mod* (this.quant_tables[args.q][0x27] as base.u32)
|
||||
bq0 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x07]) ~mod* (this.quant_tables[args.q][0x07] as base.u32)
|
||||
bq4 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x27]) ~mod* (this.quant_tables[args.q][0x27] as base.u32)
|
||||
|
||||
ccp = (bq0 ~mod+ bq4) ~mod<< 13
|
||||
ccm = (bq0 ~mod- bq4) ~mod<< 13
|
||||
@@ -787,10 +787,10 @@ pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, b
|
||||
|
||||
// Odd rows.
|
||||
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x0F]) ~mod* (this.quant_tables[args.q][0x0F] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x1F]) ~mod* (this.quant_tables[args.q][0x1F] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x2F]) ~mod* (this.quant_tables[args.q][0x2F] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[args.b][0x3F]) ~mod* (this.quant_tables[args.q][0x3F] as base.u32)
|
||||
bq1 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x0F]) ~mod* (this.quant_tables[args.q][0x0F] as base.u32)
|
||||
bq3 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x1F]) ~mod* (this.quant_tables[args.q][0x1F] as base.u32)
|
||||
bq5 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x2F]) ~mod* (this.quant_tables[args.q][0x2F] as base.u32)
|
||||
bq7 = this.util.sign_extend_convert_u16_u32(a: this.mcu_blocks[0][0x3F]) ~mod* (this.quant_tables[args.q][0x3F] as base.u32)
|
||||
|
||||
ci51 = bq5 ~mod+ bq1
|
||||
ci53 = bq5 ~mod+ bq3
|
||||
|
||||
@@ -49,6 +49,8 @@ pub struct decoder? implements base.image_decoder(
|
||||
// (/doc/std/image-decoders-call-sequence.md).
|
||||
call_sequence : base.u8,
|
||||
|
||||
test_only_interrupt_decode_mcu : base.bool,
|
||||
|
||||
sof_marker : base.u8,
|
||||
next_restart_marker : base.u8[..= 7],
|
||||
|
||||
@@ -289,6 +291,9 @@ pub struct decoder? implements base.image_decoder(
|
||||
) + (
|
||||
bitstream_buffer : array[0x800] base.u8, // 0x800 = 2048.
|
||||
|
||||
// Decoding sequential JPEGs only uses the first element of this array,
|
||||
// since sequential decode_mcu calls decode_idct straight away.
|
||||
// Decoding progressive JPEGs can use all of it.
|
||||
mcu_blocks : array[10] array[64] base.u16,
|
||||
|
||||
swizzle_ycck_scratch_buffer_2k : array[2048] base.u8,
|
||||
@@ -1135,11 +1140,6 @@ pri func decoder.decode_sos?(dst: ptr base.pixel_buffer, src: base.io_reader, wo
|
||||
var decode_mcu_result : base.u32
|
||||
var bitstream_length : base.u32
|
||||
|
||||
var b : base.u32
|
||||
var csel : base.u8[..= 3]
|
||||
var stride : base.u64[..= 0x1_0008]
|
||||
var offset : base.u64
|
||||
|
||||
if this.scan_count >= 64 {
|
||||
return "#unsupported scan count"
|
||||
}
|
||||
@@ -1173,16 +1173,13 @@ pri func decoder.decode_sos?(dst: ptr base.pixel_buffer, src: base.io_reader, wo
|
||||
|
||||
if this.sof_marker >= 0xC2 {
|
||||
this.load_mcu_blocks!(mx: mx, my: my, workbuf: args.workbuf)
|
||||
} else {
|
||||
// Clear this.mcu_blocks.
|
||||
this.mcu_blocks[.. this.mcu_num_blocks].bulk_memset!(byte_value: 0)
|
||||
}
|
||||
|
||||
while.decode_mcu true,
|
||||
inv my < 0x2000,
|
||||
inv mx < 0x2000,
|
||||
{
|
||||
decode_mcu_result = this.decode_mcu!()
|
||||
decode_mcu_result = this.decode_mcu!(workbuf: args.workbuf, mx: mx, my: my)
|
||||
if decode_mcu_result == 0 {
|
||||
break.decode_mcu
|
||||
} else if decode_mcu_result <> 1 {
|
||||
@@ -1204,29 +1201,6 @@ pri func decoder.decode_sos?(dst: ptr base.pixel_buffer, src: base.io_reader, wo
|
||||
|
||||
if this.sof_marker >= 0xC2 {
|
||||
this.save_mcu_blocks!(mx: mx, my: my, workbuf: args.workbuf)
|
||||
} else {
|
||||
// Apply IDCT.
|
||||
b = 0
|
||||
while b < this.mcu_num_blocks,
|
||||
inv my < 0x2000,
|
||||
inv mx < 0x2000,
|
||||
{
|
||||
assert b < 10 via "a < b: a < c; c <= b"(c: this.mcu_num_blocks)
|
||||
csel = this.scan_comps_cselector[this.mcu_blocks_sselector[b]]
|
||||
stride = this.components_workbuf_widths[csel] as base.u64
|
||||
offset = this.mcu_blocks_offset[b] +
|
||||
((this.mcu_blocks_mx_mul[b] as base.u64) * (mx as base.u64)) +
|
||||
((this.mcu_blocks_my_mul[b] as base.u64) * (my as base.u64))
|
||||
if offset <= args.workbuf.length() {
|
||||
this.decode_idct!(
|
||||
dst_buffer: args.workbuf[offset ..],
|
||||
dst_stride: stride,
|
||||
b: b,
|
||||
q: this.components_tq[csel] as base.u32)
|
||||
|
||||
}
|
||||
b += 1
|
||||
} endwhile
|
||||
}
|
||||
|
||||
// Check for a restart.
|
||||
@@ -1715,7 +1689,6 @@ pri func decoder.apply_progressive_idct!(workbuf: slice base.u8) {
|
||||
this.decode_idct!(
|
||||
dst_buffer: args.workbuf[offset ..],
|
||||
dst_stride: stride,
|
||||
b: 0,
|
||||
q: this.components_tq[csel] as base.u32)
|
||||
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_mcu!() base.u32,
|
||||
pri func decoder.decode_mcu!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], my: base.u32[..= 0x1FFF]) base.u32,
|
||||
choosy,
|
||||
{
|
||||
var ret : base.u32
|
||||
@@ -51,6 +51,10 @@ pri func decoder.decode_mcu!() base.u32,
|
||||
|
||||
var z : base.u32[..= 78] // 78 = 63 + 15.
|
||||
|
||||
var mcb : base.u32[..= 9]
|
||||
var stride : base.u64[..= 0x1_0008]
|
||||
var offset : base.u64
|
||||
|
||||
bits = this.bitstream_bits
|
||||
n_bits = this.bitstream_n_bits
|
||||
|
||||
@@ -65,6 +69,8 @@ pri func decoder.decode_mcu!() base.u32,
|
||||
while.dc_component this.mcu_zig_index <= 0,
|
||||
inv this.mcu_current_block < 10,
|
||||
{
|
||||
this.mcu_blocks[.. 1].bulk_memset!(byte_value: 0)
|
||||
|
||||
// Load at least 31 bits, by keeping 56 .. 64 loaded.
|
||||
if r.length() < 8 {
|
||||
ret = 1 // Request another fill_bitstream call.
|
||||
@@ -118,7 +124,7 @@ pri func decoder.decode_mcu!() base.u32,
|
||||
n_bits ~mod-= dc_symbol
|
||||
csel = this.scan_comps_cselector[this.mcu_blocks_sselector[this.mcu_current_block]]
|
||||
this.mcu_previous_dc_values[csel] ~mod+= (dc_value & 0xFFFF) as base.u16
|
||||
this.mcu_blocks[this.mcu_current_block][0] =
|
||||
this.mcu_blocks[0][0] =
|
||||
this.mcu_previous_dc_values[csel]
|
||||
|
||||
this.mcu_zig_index = 1
|
||||
@@ -183,7 +189,7 @@ pri func decoder.decode_mcu!() base.u32,
|
||||
bits ~mod<<= ac_ssss
|
||||
n_bits ~mod-= ac_ssss
|
||||
z = this.mcu_zig_index + ac_rrrr
|
||||
this.mcu_blocks[this.mcu_current_block][UNZIG[z]] =
|
||||
this.mcu_blocks[0][UNZIG[z]] =
|
||||
(ac_value & 0xFFFF) as base.u16
|
||||
if (z + 1) > 63 {
|
||||
break.ac_components
|
||||
@@ -200,7 +206,25 @@ pri func decoder.decode_mcu!() base.u32,
|
||||
|
||||
this.mcu_zig_index = 0
|
||||
assert this.mcu_current_block < 10
|
||||
mcb = this.mcu_current_block
|
||||
this.mcu_current_block += 1
|
||||
if this.test_only_interrupt_decode_mcu {
|
||||
break.goto_done
|
||||
}
|
||||
|
||||
// Apply IDCT.
|
||||
csel = this.scan_comps_cselector[this.mcu_blocks_sselector[mcb]]
|
||||
stride = this.components_workbuf_widths[csel] as base.u64
|
||||
offset = this.mcu_blocks_offset[mcb] +
|
||||
((this.mcu_blocks_mx_mul[mcb] as base.u64) * (args.mx as base.u64)) +
|
||||
((this.mcu_blocks_my_mul[mcb] as base.u64) * (args.my as base.u64))
|
||||
if offset <= args.workbuf.length() {
|
||||
this.decode_idct!(
|
||||
dst_buffer: args.workbuf[offset ..],
|
||||
dst_stride: stride,
|
||||
q: this.components_tq[csel] as base.u32)
|
||||
|
||||
}
|
||||
} endwhile.block
|
||||
this.mcu_current_block = 0
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_mcu_progressive_ac_high_bits!() base.u32 {
|
||||
pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], my: base.u32[..= 0x1FFF]) base.u32 {
|
||||
var ret : base.u32
|
||||
|
||||
var bits : base.u64
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_mcu_progressive_ac_low_bit!() base.u32 {
|
||||
pri func decoder.decode_mcu_progressive_ac_low_bit!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], my: base.u32[..= 0x1FFF]) base.u32 {
|
||||
var ret : base.u32
|
||||
|
||||
var bits : base.u64
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_mcu_progressive_dc_high_bits!() base.u32 {
|
||||
pri func decoder.decode_mcu_progressive_dc_high_bits!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], my: base.u32[..= 0x1FFF]) base.u32 {
|
||||
var ret : base.u32
|
||||
|
||||
var bits : base.u64
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_mcu_progressive_dc_low_bit!() base.u32 {
|
||||
pri func decoder.decode_mcu_progressive_dc_low_bit!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], my: base.u32[..= 0x1FFF]) base.u32 {
|
||||
var ret : base.u32
|
||||
|
||||
var bits : base.u64
|
||||
|
||||
Reference in new issue
Block a user