The-Homebrew-Cloud/N64FlashcartMenu
2
0
Fork 0
mirror of https://github.com/Polprzewodnikowy/N64FlashcartMenu.git synced 2024-11-25 12:06:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

PNG decode speed up

Browse Source
This commit is contained in:
Mateusz Faderewski 2023-07-28 21:24:47 +02:00
parent 3f08dfb6fd
commit 17fde21b6f
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/menu/png_decoder.c
View File

@ -1,11 +1,12 @@
#include <fatfs/ff.h>
#include <libspng/spng/spng.h> #include <libspng/spng/spng.h>
#include "path.h"
#include "png_decoder.h" #include "png_decoder.h"
#include "utils/fs.h"
typedef struct { typedef struct {
FILE *file; FIL fil;
spng_ctx *ctx; spng_ctx *ctx;
struct spng_ihdr ihdr; struct spng_ihdr ihdr;
@ -22,9 +23,7 @@ static png_decoder_t *decoder;
static void png_decoder_deinit (bool free_image) { static void png_decoder_deinit (bool free_image) {
if (decoder != NULL) { if (decoder != NULL) {
if (decoder->file != NULL) { f_close(&decoder->fil);
fclose(decoder->file);
}
if (decoder->ctx != NULL) { if (decoder->ctx != NULL) {
spng_ctx_free(decoder->ctx); spng_ctx_free(decoder->ctx);
} }
@ -40,11 +39,23 @@ static void png_decoder_deinit (bool free_image) {
} }
} }
static int png_file_read (spng_ctx *ctx, void *user, void *dst_src, size_t length) {
UINT bytes_read = 0;
png_decoder_t *d = (png_decoder_t *) (user);
if (f_read(&d->fil, dst_src, length, &bytes_read) != FR_OK) {
return SPNG_IO_ERROR;
}
if (bytes_read != length) {
return SPNG_EOF;
}
return SPNG_OK;
}
png_err_t png_decode_start (char *path, int max_width, int max_height, png_callback_t *callback, void *callback_data) { png_err_t png_decode_start (char *path, int max_width, int max_height, png_callback_t *callback, void *callback_data) {
path_t *file_path;
size_t image_size;
if (decoder != NULL) { if (decoder != NULL) {
return PNG_ERR_BUSY; return PNG_ERR_BUSY;
} }
@ -54,11 +65,7 @@ png_err_t png_decode_start (char *path, int max_width, int max_height, png_callb
return PNG_ERR_OUT_OF_MEM; return PNG_ERR_OUT_OF_MEM;
} }
file_path = path_init("sd:/"); if (f_open(&decoder->fil, strip_sd_prefix(path), FA_READ) != FR_OK) {
path_append(file_path, path);
decoder->file = fopen(path_get(file_path), "r");
path_free(file_path);
if (decoder->file == NULL) {
png_decoder_deinit(false); png_decoder_deinit(false);
return PNG_ERR_NO_FILE; return PNG_ERR_NO_FILE;
} }
@ -78,11 +85,13 @@ png_err_t png_decode_start (char *path, int max_width, int max_height, png_callb
return PNG_ERR_INT; return PNG_ERR_INT;
} }
if (spng_set_png_file(decoder->ctx, decoder->file) != SPNG_OK) { if (spng_set_png_stream(decoder->ctx, png_file_read, decoder) != SPNG_OK) {
png_decoder_deinit(false); png_decoder_deinit(false);
return PNG_ERR_INT; return PNG_ERR_INT;
} }
size_t image_size;
if (spng_decoded_image_size(decoder->ctx, SPNG_FMT_RGB8, &image_size) != SPNG_OK) { if (spng_decoded_image_size(decoder->ctx, SPNG_FMT_RGB8, &image_size) != SPNG_OK) {
png_decoder_deinit(false); png_decoder_deinit(false);
return PNG_ERR_BAD_FILE; return PNG_ERR_BAD_FILE;