Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-28 22:30:49 +08:00
Code Issues Actions 93 Packages Projects Releases Wiki Activity

fix(bin_decoder): fix the crash when decoder A8 images and flush cache (#7952)

Browse Source 
Signed-off-by: yushuailong <yushuailong1@xiaomi.com>
This commit is contained in:
yushuailong
2025-03-23 19:50:41 +08:00
committed by GitHub
parent 69c16a2412
commit 0fe1d28428
2 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/bin_decoder/lv_bin_decoder.c
+6 -13
View File
@@ -279,21 +279,14 @@ lv_result_t lv_bin_decoder_open(lv_image_decoder_t * decoder, lv_image_decoder_d
res = decode_indexed(decoder, dsc); res = decode_indexed(decoder, dsc);
} }
} }
else if(LV_COLOR_FORMAT_IS_ALPHA_ONLY(cf)) { else if(LV_COLOR_FORMAT_IS_ALPHA_ONLY(cf) && cf != LV_COLOR_FORMAT_A8) {
if(cf == LV_COLOR_FORMAT_A8) { /*Alpha only image will need decoder data to store pointer to decoded image, to free it when decoder closes*/
res = LV_RESULT_OK; decoder_data_t * decoder_data = get_decoder_data(dsc);
use_directly = true; if(decoder_data == NULL) {
dsc->decoded = (lv_draw_buf_t *)image; return LV_RESULT_INVALID;
} }
else {
/*Alpha only image will need decoder data to store pointer to decoded image, to free it when decoder closes*/
decoder_data_t * decoder_data = get_decoder_data(dsc);
if(decoder_data == NULL) {
return LV_RESULT_INVALID;
}
res = decode_alpha_only(decoder, dsc); res = decode_alpha_only(decoder, dsc);
}
} }
else { else {
/*In case of uncompressed formats the image stored in the ROM/RAM. /*In case of uncompressed formats the image stored in the ROM/RAM.
tests/src/test_cases/libs/test_bin_decoder.c
+49
View File
@@ -160,4 +160,53 @@ void test_bin_decoder_image_dsc_error_handling(void)
bin_decoder(NULL, "libs/bin_decoder_empty_image.png"); bin_decoder(NULL, "libs/bin_decoder_empty_image.png");
} }
void test_bin_decoder_flush_cache(void)
{
#if LV_BIN_DECODER_RAM_LOAD == 1
LV_IMAGE_DECLARE(test_I1_NONE_align64);
LV_IMAGE_DECLARE(test_I2_NONE_align64);
LV_IMAGE_DECLARE(test_I4_NONE_align64);
LV_IMAGE_DECLARE(test_I8_NONE_align64);
LV_IMAGE_DECLARE(test_A1_NONE_align64);
LV_IMAGE_DECLARE(test_A2_NONE_align64);
LV_IMAGE_DECLARE(test_A4_NONE_align64);
LV_IMAGE_DECLARE(test_A8_NONE_align64);
LV_IMAGE_DECLARE(test_RGB565A8_NONE_align64);
LV_IMAGE_DECLARE(test_RGB565_NONE_align64);
LV_IMAGE_DECLARE(test_RGB888_NONE_align64);
LV_IMAGE_DECLARE(test_XRGB8888_NONE_align64);
LV_IMAGE_DECLARE(test_ARGB8888_NONE_align64);
const lv_image_dsc_t * img_dscs[] = {
&test_I1_NONE_align64,
&test_I2_NONE_align64,
&test_I4_NONE_align64,
&test_I8_NONE_align64,
&test_A1_NONE_align64,
&test_A2_NONE_align64,
&test_A4_NONE_align64,
&test_A8_NONE_align64,
&test_RGB565A8_NONE_align64,
&test_RGB565_NONE_align64,
&test_RGB888_NONE_align64,
&test_XRGB8888_NONE_align64,
&test_ARGB8888_NONE_align64,
};
const lv_image_decoder_args_t args = {
.no_cache = true,
.premultiply = false,
.stride_align = false,
.use_indexed = true,
.flush_cache = true,
};
for(unsigned long i = 0; i < sizeof(img_dscs) / sizeof(img_dscs[0]); i++) {
lv_image_decoder_dsc_t decoder_dsc;
lv_result_t res = lv_image_decoder_open(&decoder_dsc, img_dscs[i], &args);
TEST_ASSERT_EQUAL(LV_RESULT_OK, res);
lv_image_decoder_close(&decoder_dsc);
}
#endif
}
#endif #endif