mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
1 parent
6fd9767b5d
commit
c914f66a6c
5 files changed
+1035
-25
No files matched your search
+144
-3
@@ -179,7 +179,7 @@ do_test_wuffs_jpeg_decode_dht(wuffs_base__io_buffer* src,
|
||||
if (use_fast) {
|
||||
uint16_t x = (*want_fast)[bits >> 24];
|
||||
uint32_t n = x >> 8;
|
||||
if (x == 0) {
|
||||
if (x == 0xFFFF) {
|
||||
have = err_fast_not_applicable;
|
||||
} else if (n > n_bits) {
|
||||
have = err_not_enough_bits;
|
||||
@@ -344,7 +344,7 @@ test_wuffs_jpeg_decode_dht_easy() {
|
||||
0x0408, 0x0408, 0x0408, 0x0408, 0x0408, 0x0408, 0x0408, 0x0408, //
|
||||
0x0408, 0x0408, 0x0408, 0x0408, 0x0408, 0x0408, 0x0408, 0x0408, //
|
||||
0x0509, 0x0509, 0x0509, 0x0509, 0x0509, 0x0509, 0x0509, 0x0509, //
|
||||
0x0602, 0x0602, 0x0602, 0x0602, 0x0701, 0x0701, 0x0000, 0x0000, //
|
||||
0x0602, 0x0602, 0x0602, 0x0602, 0x0701, 0x0701, 0xFFFF, 0xFFFF, //
|
||||
};
|
||||
|
||||
return do_test_wuffs_jpeg_decode_dht(&src, bits, n_bits, want_dst_ptr,
|
||||
@@ -523,7 +523,7 @@ test_wuffs_jpeg_decode_dht_hard() {
|
||||
0x0607, 0x0607, 0x0607, 0x0607, 0x0612, 0x0612, 0x0612, 0x0612, //
|
||||
0x0621, 0x0621, 0x0621, 0x0621, 0x0631, 0x0631, 0x0631, 0x0631, //
|
||||
0x0713, 0x0713, 0x0741, 0x0741, 0x0751, 0x0751, 0x0808, 0x0814, //
|
||||
0x0822, 0x0861, 0x0871, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0822, 0x0861, 0x0871, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, //
|
||||
};
|
||||
|
||||
return do_test_wuffs_jpeg_decode_dht(&src, bits, n_bits, want_dst_ptr,
|
||||
@@ -531,6 +531,146 @@ test_wuffs_jpeg_decode_dht_hard() {
|
||||
&want_fast);
|
||||
}
|
||||
|
||||
const char* //
|
||||
test_wuffs_jpeg_decode_mcu() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
|
||||
.data = g_src_slice_u8,
|
||||
});
|
||||
CHECK_STRING(read_file(&src, "test/data/bricks-color.jpeg"));
|
||||
|
||||
wuffs_jpeg__decoder dec;
|
||||
CHECK_STATUS("initialize", wuffs_jpeg__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__DEFAULT_OPTIONS));
|
||||
|
||||
// Decode the 0xC0 SOF marker, four 0xC4 DHT markers and 0xDA SOS marker. The
|
||||
// SOS marker is only partially processed, since complete SOS processing
|
||||
// would call wuffs_jpeg__decoder__decode_mcu multiple times.
|
||||
const uint32_t marker_positions[6] = //
|
||||
{0x09E, 0x0B1, 0x0D0, 0x114, 0x133, 0x16E};
|
||||
for (int i = 0; i < WUFFS_TESTLIB_ARRAY_SIZE(marker_positions); i++) {
|
||||
uint8_t want_marker = (i <= 0) ? 0xC0 : ((i <= 4) ? 0xC4 : 0xDA);
|
||||
src.meta.ri = marker_positions[i];
|
||||
if ((src.meta.ri + 4) > src.meta.wi) {
|
||||
RETURN_FAIL("seek #%d: past EOF", i);
|
||||
} else if (src.data.ptr[src.meta.ri++] != 0xFF) {
|
||||
RETURN_FAIL("seek #%d: have 0x%02X, want 0x%02X", i,
|
||||
src.data.ptr[src.meta.ri - 1], 0xFF);
|
||||
} else if (src.data.ptr[src.meta.ri++] != want_marker) {
|
||||
RETURN_FAIL("seek #%d: have 0x%02X, want 0x%02X", i,
|
||||
src.data.ptr[src.meta.ri - 1], want_marker);
|
||||
}
|
||||
|
||||
dec.private_impl.f_payload_length = 0;
|
||||
dec.private_impl.f_payload_length |= src.data.ptr[src.meta.ri++];
|
||||
dec.private_impl.f_payload_length <<= 8;
|
||||
dec.private_impl.f_payload_length |= src.data.ptr[src.meta.ri++];
|
||||
dec.private_impl.f_payload_length -= 2;
|
||||
|
||||
if (i <= 0) {
|
||||
dec.private_impl.f_sof_marker = 0xC0;
|
||||
CHECK_STATUS("decode_sof", wuffs_jpeg__decoder__decode_sof(&dec, &src));
|
||||
} else if (i <= 4) {
|
||||
CHECK_STATUS("decode_dht", wuffs_jpeg__decoder__decode_dht(&dec, &src));
|
||||
} else {
|
||||
CHECK_STATUS("prepare_scan",
|
||||
wuffs_jpeg__decoder__prepare_scan(&dec, &src));
|
||||
wuffs_jpeg__decoder__fill_bitstream(&dec, &src);
|
||||
}
|
||||
}
|
||||
|
||||
// Decode and compare-to-golden the first MCU (Minimum Coded Unit).
|
||||
|
||||
if (wuffs_jpeg__decoder__decode_mcu(&dec)) {
|
||||
RETURN_FAIL("decode_mcu failed");
|
||||
}
|
||||
|
||||
// 4:2:0 chroma subsampling means that the MCU has 4 Y, 1 Cb and 1 Cr blocks.
|
||||
uint16_t wants[10][64] = {
|
||||
{
|
||||
0xFFC9, 0xFFD8, 0x0014, 0xFFF7, 0x0002, 0x0000, 0x0000, 0x0000, //
|
||||
0x006A, 0xFFE3, 0x001C, 0xFFF9, 0x0002, 0x0000, 0x0000, 0x0000, //
|
||||
0x0015, 0x0002, 0x0002, 0xFFFE, 0x0001, 0x0000, 0x0000, 0x0001, //
|
||||
0x000D, 0xFFEC, 0x0005, 0xFFFE, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0xFFFA, 0xFFFA, 0x0002, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0001, 0xFFFD, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
},
|
||||
{
|
||||
0xFFAA, 0x0070, 0x003A, 0xFFE0, 0xFFF9, 0x0004, 0x0000, 0x0001, //
|
||||
0x004F, 0x005E, 0x0022, 0x0006, 0xFFF3, 0xFFFD, 0x0004, 0x0000, //
|
||||
0xFFF4, 0xFFE8, 0x0002, 0x0012, 0x0003, 0x0000, 0xFFFF, 0x0002, //
|
||||
0xFFEC, 0xFFF3, 0x000A, 0x000A, 0x0007, 0x0000, 0xFFFF, 0xFFFF, //
|
||||
0xFFF3, 0xFFFB, 0xFFFD, 0x0002, 0x0002, 0x0000, 0x0001, 0x0000, //
|
||||
0xFFFC, 0xFFFB, 0xFFFD, 0xFFFF, 0x0000, 0x0002, 0x0001, 0x0001, //
|
||||
0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0x0001, 0x0001, 0x0001, //
|
||||
0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0001, 0x0000, //
|
||||
},
|
||||
{
|
||||
0xFF25, 0x000D, 0x0003, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x000E, 0x0006, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0005, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0004, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
},
|
||||
{
|
||||
0xFF59, 0xFFD6, 0xFFCF, 0x000C, 0x0006, 0xFFFE, 0xFFFE, 0x0002, //
|
||||
0xFFF3, 0x0013, 0x000C, 0xFFE6, 0x000E, 0x0001, 0xFFFC, 0x0004, //
|
||||
0x0010, 0xFFF1, 0x0005, 0x0003, 0xFFFA, 0x0002, 0x0001, 0xFFFE, //
|
||||
0xFFF9, 0x0005, 0x0000, 0xFFFE, 0x0002, 0x0000, 0xFFFE, 0x0002, //
|
||||
0x0003, 0xFFFF, 0x0000, 0x0001, 0xFFFF, 0x0000, 0x0001, 0xFFFF, //
|
||||
0xFFFE, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
},
|
||||
{
|
||||
0x0077, 0x000F, 0xFFFA, 0x0001, 0x0000, 0xFFFF, 0x0002, 0xFFFF, //
|
||||
0xFFFA, 0x0020, 0xFFF9, 0x0000, 0x0000, 0xFFFF, 0x0001, 0xFFFF, //
|
||||
0xFFFA, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0001, 0x0000, 0x0000, //
|
||||
0xFFFE, 0x0001, 0x0001, 0x0001, 0xFFFF, 0x0001, 0xFFFF, 0x0000, //
|
||||
0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
},
|
||||
{
|
||||
0xFF88, 0x0003, 0xFFFD, 0x0000, 0x0000, 0x0000, 0xFFFF, 0x0001, //
|
||||
0xFFE4, 0xFFEC, 0x0001, 0x0001, 0x0000, 0x0001, 0xFFFF, 0x0001, //
|
||||
0xFFFC, 0xFFFC, 0xFFFE, 0x0000, 0x0001, 0xFFFF, 0x0000, 0x0000, //
|
||||
0x0001, 0xFFFF, 0xFFFF, 0x0000, 0x0001, 0xFFFF, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0xFFFE, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, //
|
||||
},
|
||||
{0}, //
|
||||
{0}, //
|
||||
{0}, //
|
||||
{0}, //
|
||||
};
|
||||
|
||||
for (int b = 0; b < 10; b++) {
|
||||
wuffs_base__io_buffer have = wuffs_base__ptr_u8__reader( //
|
||||
(void*)(&dec.private_data.f_mcu_blocks[b]), //
|
||||
sizeof(dec.private_data.f_mcu_blocks[b]), true);
|
||||
wuffs_base__io_buffer want = wuffs_base__ptr_u8__reader( //
|
||||
(void*)(&wants[b]), //
|
||||
sizeof(wants[b]), true);
|
||||
|
||||
char prefix[64];
|
||||
snprintf(prefix, 64, "b=%d: ", b);
|
||||
CHECK_STRING(check_io_buffers_equal(prefix, &have, &want));
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// ---------------- Mimic Tests
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
@@ -565,6 +705,7 @@ proc g_tests[] = {
|
||||
|
||||
test_wuffs_jpeg_decode_dht_easy,
|
||||
test_wuffs_jpeg_decode_dht_hard,
|
||||
test_wuffs_jpeg_decode_mcu,
|
||||
test_wuffs_jpeg_decode_interface,
|
||||
test_wuffs_jpeg_decode_truncated_input,
|
||||
|
||||
|
||||
Reference in new issue
Block a user