Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-06-08 08:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing 2 issues found via artificial encoder fuzzing, impacting the ASTC HDR 6x6/UASTC HDR 6x6i codec:

Browse Source 
- 3 subset CEM 7/11 partition compression needs to check for rare failures
- adding clamp to bc6h encoder's smooth block weight index assigner (assign_weights_simple_4)
This commit is contained in:
Richard Geldreich
2026-03-06 17:20:37 -05:00
parent 6d9c1c2ed1
commit c606cef87c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
encoder/basisu_astc_hdr_6x6_enc.cpp
View File

@@ -1868,14 +1868,16 @@ static bool encode_block_3_subsets(
uint8_t blk_weights[NUM_SUBSETS][BLOCK_W * BLOCK_H];
uint32_t best_submode[NUM_SUBSETS];
bool failed_flag = false;
double e = 0.0f;
for (uint32_t part_iter = 0; part_iter < NUM_SUBSETS; part_iter++)
{
assert(part_total_pixels[part_iter]);
double part_e;
if (cem == 7)
{
e += encode_astc_hdr_block_mode_7(
part_e = encode_astc_hdr_block_mode_7(
part_total_pixels[part_iter],
(basist::half_float(*)[3])part_half_pixels[part_iter], (vec4F*)part_pixels_q16[part_iter],
best_log_blk.m_weight_ise_range,
@@ -1890,7 +1892,7 @@ static bool encode_block_3_subsets(
{
assert(cem == 11);
e += encode_astc_hdr_block_mode_11(
part_e = encode_astc_hdr_block_mode_11(
part_total_pixels[part_iter],
(basist::half_float(*)[3])part_half_pixels[part_iter], (vec4F*)part_pixels_q16[part_iter],
best_log_blk.m_weight_ise_range,
@@ -1903,8 +1905,17 @@ static bool encode_block_3_subsets(
FIRST_MODE11_SUBMODE_INDEX, MAX_MODE11_SUBMODE_INDEX, false, mode11_opt_mode);
}
if (part_e == BIG_FLOAT_VAL)
{
failed_flag = true;
break;
}
e += part_e;
} // part_iter
if (failed_flag)
continue;
uint8_t ise_weights[BLOCK_W * BLOCK_H];
uint32_t src_pixel_index[NUM_SUBSETS] = { 0 };