mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
std/jpeg: prepare decode_idct_x86_avx2.wuffs
This commit is contained in:
1 parent
4dfd70928b
commit
e5b6f2563e
4 files changed
+112
-16
No files matched your search
@@ -9159,6 +9159,11 @@ struct wuffs_jpeg__decoder__struct {
|
||||
uint16_t f_huff_tables_fast[8][256];
|
||||
wuffs_base__pixel_swizzler f_swizzler;
|
||||
|
||||
wuffs_base__empty_struct (*choosy_decode_idct)(
|
||||
wuffs_jpeg__decoder* self,
|
||||
wuffs_base__slice_u8 a_dst_buffer,
|
||||
uint64_t a_dst_stride,
|
||||
uint32_t a_q);
|
||||
uint32_t p_decode_image_config[1];
|
||||
uint32_t p_do_decode_image_config[1];
|
||||
uint32_t p_decode_dqt[1];
|
||||
@@ -38594,6 +38599,24 @@ wuffs_jpeg__decoder__decode_idct(
|
||||
uint64_t a_dst_stride,
|
||||
uint32_t a_q);
|
||||
|
||||
WUFFS_BASE__GENERATED_C_CODE
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_jpeg__decoder__decode_idct__choosy_default(
|
||||
wuffs_jpeg__decoder* self,
|
||||
wuffs_base__slice_u8 a_dst_buffer,
|
||||
uint64_t a_dst_stride,
|
||||
uint32_t a_q);
|
||||
|
||||
#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
|
||||
WUFFS_BASE__GENERATED_C_CODE
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_jpeg__decoder__decode_idct_x86_avx2(
|
||||
wuffs_jpeg__decoder* self,
|
||||
wuffs_base__slice_u8 a_dst_buffer,
|
||||
uint64_t a_dst_stride,
|
||||
uint32_t a_q);
|
||||
#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
|
||||
|
||||
WUFFS_BASE__GENERATED_C_CODE
|
||||
static wuffs_base__status
|
||||
wuffs_jpeg__decoder__do_decode_image_config(
|
||||
@@ -38865,6 +38888,7 @@ wuffs_jpeg__decoder__initialize(
|
||||
}
|
||||
}
|
||||
|
||||
self->private_impl.choosy_decode_idct = &wuffs_jpeg__decoder__decode_idct__choosy_default;
|
||||
self->private_impl.choosy_decode_mcu = &wuffs_jpeg__decoder__decode_mcu__choosy_default;
|
||||
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
@@ -38906,6 +38930,16 @@ wuffs_jpeg__decoder__decode_idct(
|
||||
wuffs_base__slice_u8 a_dst_buffer,
|
||||
uint64_t a_dst_stride,
|
||||
uint32_t a_q) {
|
||||
return (*self->private_impl.choosy_decode_idct)(self, a_dst_buffer, a_dst_stride, a_q);
|
||||
}
|
||||
|
||||
WUFFS_BASE__GENERATED_C_CODE
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_jpeg__decoder__decode_idct__choosy_default(
|
||||
wuffs_jpeg__decoder* self,
|
||||
wuffs_base__slice_u8 a_dst_buffer,
|
||||
uint64_t a_dst_stride,
|
||||
uint32_t a_q) {
|
||||
uint32_t v_bq0 = 0;
|
||||
uint32_t v_bq2 = 0;
|
||||
uint32_t v_bq4 = 0;
|
||||
@@ -40008,6 +40042,23 @@ wuffs_jpeg__decoder__decode_idct(
|
||||
return wuffs_base__make_empty_struct();
|
||||
}
|
||||
|
||||
// ‼ WUFFS MULTI-FILE SECTION +x86_avx2
|
||||
// -------- func jpeg.decoder.decode_idct_x86_avx2
|
||||
|
||||
#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
|
||||
WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
|
||||
WUFFS_BASE__GENERATED_C_CODE
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_jpeg__decoder__decode_idct_x86_avx2(
|
||||
wuffs_jpeg__decoder* self,
|
||||
wuffs_base__slice_u8 a_dst_buffer,
|
||||
uint64_t a_dst_stride,
|
||||
uint32_t a_q) {
|
||||
return wuffs_base__make_empty_struct();
|
||||
}
|
||||
#endif // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
|
||||
// ‼ WUFFS MULTI-FILE SECTION -x86_avx2
|
||||
|
||||
// -------- func jpeg.decoder.get_quirk
|
||||
|
||||
WUFFS_BASE__GENERATED_C_CODE
|
||||
|
||||
@@ -12,7 +12,9 @@
|
||||
// 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, q: base.u32[..= 3]) {
|
||||
pri func decoder.decode_idct!(dst_buffer: slice base.u8, dst_stride: base.u64, q: base.u32[..= 3]),
|
||||
choosy,
|
||||
{
|
||||
// This method implements the same algorithm as libjpeg-turbo's jidctint.c.
|
||||
|
||||
var bq0 : base.u32
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
// Copyright 2023 The Wuffs Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// https://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_idct_x86_avx2!(dst_buffer: slice base.u8, dst_stride: base.u64, q: base.u32[..= 3]),
|
||||
choose cpu_arch >= x86_avx2,
|
||||
{
|
||||
// TODO.
|
||||
}
|
||||
+39
-15
@@ -574,26 +574,50 @@ test_wuffs_jpeg_decode_idct() {
|
||||
0x4C, 0x4C, 0x52, 0x4F, 0x4D, 0x40, 0x3A, 0x35, //
|
||||
};
|
||||
|
||||
wuffs_jpeg__decoder dec;
|
||||
CHECK_STATUS("initialize", wuffs_jpeg__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__DEFAULT_OPTIONS));
|
||||
for (int f = 0; f < 2; f++) {
|
||||
wuffs_jpeg__decoder dec;
|
||||
CHECK_STATUS("initialize", wuffs_jpeg__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__DEFAULT_OPTIONS));
|
||||
|
||||
memcpy(&dec.private_data.f_mcu_blocks[0], mcu_block, sizeof(mcu_block));
|
||||
memcpy(&dec.private_data.f_mcu_blocks[0], mcu_block, sizeof(mcu_block));
|
||||
|
||||
const uint32_t q = 0;
|
||||
memcpy(&dec.private_impl.f_quant_tables[q], quant_table, sizeof(quant_table));
|
||||
const uint32_t q = 0;
|
||||
memcpy(&dec.private_impl.f_quant_tables[q], quant_table,
|
||||
sizeof(quant_table));
|
||||
|
||||
uint8_t dst_array[64] = {0};
|
||||
wuffs_jpeg__decoder__decode_idct(
|
||||
&dec, wuffs_base__make_slice_u8(&dst_array[0], 64), 8, q);
|
||||
const char* func_name = NULL;
|
||||
wuffs_base__empty_struct (*func)(
|
||||
wuffs_jpeg__decoder * self, wuffs_base__slice_u8 a_dst_buffer,
|
||||
uint64_t a_dst_stride, uint32_t a_q) = NULL;
|
||||
|
||||
wuffs_base__io_buffer have =
|
||||
wuffs_base__ptr_u8__reader(&dst_array[0], 64, true);
|
||||
wuffs_base__io_buffer want =
|
||||
wuffs_base__ptr_u8__reader((uint8_t*)(&want_array[0]), 64, true);
|
||||
if (f == 0) {
|
||||
func_name = "choosy_default";
|
||||
func = &wuffs_jpeg__decoder__decode_idct__choosy_default;
|
||||
#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
|
||||
} else if (wuffs_base__cpu_arch__have_x86_avx2()) {
|
||||
func_name = "x86_avx2";
|
||||
// TODO: func = &wuffs_jpeg__decoder__decode_idct_x86_avx2;
|
||||
#endif
|
||||
}
|
||||
|
||||
return check_io_buffers_equal("", &have, &want);
|
||||
if (!func) {
|
||||
continue;
|
||||
}
|
||||
uint8_t dst_array[64] = {0};
|
||||
(*func)(&dec, wuffs_base__make_slice_u8(&dst_array[0], 64), 8, q);
|
||||
|
||||
wuffs_base__io_buffer have =
|
||||
wuffs_base__ptr_u8__reader(&dst_array[0], 64, true);
|
||||
wuffs_base__io_buffer want =
|
||||
wuffs_base__ptr_u8__reader((uint8_t*)(&want_array[0]), 64, true);
|
||||
|
||||
char prefix[256];
|
||||
snprintf(prefix, 256, "f=%d (%s): ", f, func_name);
|
||||
CHECK_STRING(check_io_buffers_equal(prefix, &have, &want));
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char* //
|
||||
|
||||
Reference in new issue
Block a user