Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

feat(decoder): add compressed c-array image support (#4925)

Browse Source 
Signed-off-by: Xu Xingliang <xuxingliang@xiaomi.com>
This commit is contained in:
Neo Xu 2023-12-05 06:05:21 +08:00 committed by GitHub
parent 91020ea20e
commit 7b6f360d46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/libs/bin_decoder/lv_bin_decoder.c
View File

@ -227,10 +227,9 @@ lv_result_t lv_bin_decoder_open(lv_image_decoder_t * decoder, lv_image_decoder_d
lv_color_format_t cf = image->header.cf; lv_color_format_t cf = image->header.cf;
if(dsc->header.flags & LV_IMAGE_FLAGS_COMPRESSED) { if(dsc->header.flags & LV_IMAGE_FLAGS_COMPRESSED) {
/*@todo*/ res = decode_compressed(decoder, dsc);
res = LV_RESULT_INVALID;
} }
if(LV_COLOR_FORMAT_IS_INDEXED(cf)) { else if(LV_COLOR_FORMAT_IS_INDEXED(cf)) {
/*Need decoder data to store converted image*/ /*Need decoder data to store converted image*/
decoder_data_t * decoder_data = get_decoder_data(dsc); decoder_data_t * decoder_data = get_decoder_data(dsc);
if(decoder_data == NULL) { if(decoder_data == NULL) {
@ -665,11 +664,15 @@ static lv_result_t decode_compressed(lv_image_decoder_t * decoder, lv_image_deco
uint32_t compressed_len; uint32_t compressed_len;
uint8_t * file_buf; uint8_t * file_buf;
decoder_data_t * decoder_data = get_decoder_data(dsc); decoder_data_t * decoder_data = get_decoder_data(dsc);
lv_fs_file_t * f = decoder_data->f;
lv_result_t res; lv_result_t res;
lv_image_compressed_t * compressed = &decoder_data->compressed; lv_image_compressed_t * compressed = &decoder_data->compressed;
bool is_file = dsc->src_type == LV_IMAGE_SRC_FILE;
lv_memzero(compressed, sizeof(lv_image_compressed_t)); lv_memzero(compressed, sizeof(lv_image_compressed_t));
if(is_file) {
lv_fs_file_t * f = decoder_data->f;
if(lv_fs_seek(f, 0, LV_FS_SEEK_END) != LV_FS_RES_OK || if(lv_fs_seek(f, 0, LV_FS_SEEK_END) != LV_FS_RES_OK ||
lv_fs_tell(f, &compressed_len) != LV_FS_RES_OK) { lv_fs_tell(f, &compressed_len) != LV_FS_RES_OK) {
LV_LOG_WARN("Failed to get compressed file len"); LV_LOG_WARN("Failed to get compressed file len");
@ -709,9 +712,29 @@ static lv_result_t decode_compressed(lv_image_decoder_t * decoder, lv_image_deco
/*Decompress the image*/ /*Decompress the image*/
compressed->data = file_buf; compressed->data = file_buf;
}
else if(dsc->src_type == LV_IMAGE_SRC_VARIABLE) {
lv_image_dsc_t * image = (lv_image_dsc_t *)dsc->src;
compressed_len = image->data_size;
/*Read compress header*/
len = 12;
compressed_len -= len;
lv_memcpy(compressed, image->data, len);
compressed->data = image->data + len;
if(compressed->compressed_size != compressed_len) {
LV_LOG_WARN("Compressed size mismatch: %" LV_PRIu32" != %" LV_PRIu32, compressed->compressed_size, compressed_len);
return LV_RESULT_INVALID;
}
}
else {
LV_LOG_WARN("Compressed image only support file or variable");
return LV_RESULT_INVALID;
}
res = decompress_image(dsc, compressed); res = decompress_image(dsc, compressed);
compressed->data = NULL; /*No need to store the data any more*/ compressed->data = NULL; /*No need to store the data any more*/
lv_free(file_buf); if(is_file) lv_free(file_buf);
if(res != LV_RESULT_OK) { if(res != LV_RESULT_OK) {
LV_LOG_WARN("Decompress failed"); LV_LOG_WARN("Decompress failed");
return LV_RESULT_INVALID; return LV_RESULT_INVALID;