Skip to content

Fixed for threaded image loading #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ro8inmorgan merged 1 commit into from
May 17, 2025
Merged

Fixed for threaded image loading #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 39 additions & 60 deletions workspace/all/nextui/nextui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,7 @@ static SDL_Surface* thumbbmp = NULL;
static SDL_Surface* screen = NULL; // Must be assigned externally

// i think 2 is fine could probably even be 1
#define THREAD_POOL_SIZE 2
#define THREAD_POOL_SIZE 1

static int had_thumb = 0;
static int ox;
Expand Down Expand Up @@ -1442,7 +1442,6 @@ int imageLoadWorker(void* unused) {
while (!taskQueueHead) {
SDL_CondWait(queueCond, queueMutex);
}

TaskNode* node = taskQueueHead;
taskQueueHead = node->next;
if (!taskQueueHead) taskQueueTail = NULL;
Expand All @@ -1455,13 +1454,14 @@ int imageLoadWorker(void* unused) {
if (access(task->imagePath, F_OK) == 0) {
SDL_LockMutex(imgLoadMutex);
SDL_Surface* image = IMG_Load(task->imagePath);
SDL_UnlockMutex(imgLoadMutex);


if (image) {
SDL_Surface* imageRGBA = SDL_ConvertSurfaceFormat(image, SDL_PIXELFORMAT_RGBA8888, 0);
SDL_FreeSurface(image);
result = imageRGBA;
}
SDL_UnlockMutex(imgLoadMutex);
}

if (task->callback) task->callback(result);
Expand All @@ -1482,8 +1482,8 @@ void initImageLoaderPool() {
}
}

static int folderbgchanged=0;
static int thumbchanged=0;
int folderbgchanged=0;
int thumbchanged=0;

void startLoadFolderBackground(const char* imagePath, int type, BackgroundLoadedCallback callback, void* userData) {
LoadBackgroundTask* task = malloc(sizeof(LoadBackgroundTask));
Expand All @@ -1497,10 +1497,16 @@ void startLoadFolderBackground(const char* imagePath, int type, BackgroundLoaded

void onBackgroundLoaded(SDL_Surface* surface) {
if (!surface) return;

SDL_Surface* safeCopy = SDL_ConvertSurfaceFormat(surface, SDL_PIXELFORMAT_RGBA8888, 0);
SDL_FreeSurface(surface); // Free the original from the thread

if (!safeCopy) return;

SDL_LockMutex(folderBgMutex);
if (folderbgbmp) SDL_FreeSurface(folderbgbmp);
folderbgbmp = surface;
folderbgchanged = 1;
folderbgbmp = safeCopy;
folderbgchanged = 1;
SDL_UnlockMutex(folderBgMutex);
}

Expand All @@ -1513,29 +1519,18 @@ void startLoadThumb(const char* thumbpath, BackgroundLoadedCallback callback, vo
task->userData = userData;
enqueueTask(task);
}

void onThumbLoaded(SDL_Surface* surface) {
if (!surface) return;

// Convert to a known pixel format (e.g., RGBA8888) to ensure compatibility
SDL_Surface* safeCopy = SDL_ConvertSurfaceFormat(surface, SDL_PIXELFORMAT_RGBA8888, 0);
SDL_FreeSurface(surface); // Free the thread-allocated surface
if (!safeCopy) return;

SDL_LockMutex(thumbMutex);
if (thumbbmp) SDL_FreeSurface(thumbbmp);
thumbbmp = surface;

int img_w = thumbbmp->w;
int img_h = thumbbmp->h;
double aspect_ratio = (double)img_h / img_w;

int max_w = (int)(screen->w * 0.5); // CFG_getGameArtWidth()
int max_h = (int)(screen->h * 0.6);

int new_w = max_w;
int new_h = (int)(new_w * aspect_ratio);

if (new_h > max_h) {
new_h = max_h;
new_w = (int)(new_h / aspect_ratio);
}
thumbchanged = 1;
thumbbmp = safeCopy;
thumbchanged = 1;
SDL_UnlockMutex(thumbMutex);
}

Expand Down Expand Up @@ -1660,7 +1655,6 @@ int main (int argc, char *argv[]) {
}
else if(show_switcher) {
if (PAD_justPressed(BTN_B) || PAD_justReleased(BTN_SELECT)) {
strncpy(folderBgPath, "", sizeof(folderBgPath) - 1);
show_switcher = 0;
switcher_selected = 0;
dirty = 1;
Expand Down Expand Up @@ -2134,20 +2128,16 @@ int main (int argc, char *argv[]) {
SDL_LockMutex(folderBgMutex);
if((strcmp(newBg, folderBgPath) != 0 || lastType != entry->type) && sizeof(folderBgPath) != 1) {
lastType = entry->type;
if(folderbgbmp) SDL_FreeSurface(folderbgbmp);
folderbgbmp = NULL;

char tmppath[512];
strncpy(folderBgPath, newBg, sizeof(folderBgPath) - 1);
if (entry->type == ENTRY_DIR)
snprintf(tmppath, sizeof(tmppath), "%s/.media/bg.png", folderBgPath);
else if (entry->type == ENTRY_ROM)
snprintf(tmppath, sizeof(tmppath), "%s/.media/bglist.png", folderBgPath);

if(exists(tmppath))
startLoadFolderBackground(tmppath, entry->type, onBackgroundLoaded, NULL);
else if(bgbmp)
GFX_drawOnLayer(bgbmp,0, 0, screen->w, screen->h,1.0f,0,1);
else
GFX_clearLayers(1);
}
SDL_UnlockMutex(folderBgMutex);
}
Expand All @@ -2157,6 +2147,8 @@ int main (int argc, char *argv[]) {
if(CFG_getShowGameArt())
snprintf(thumbpath, sizeof(thumbpath), "%s/.media/%s.png", rompath, res_copy);
had_thumb = 0;
SDL_LockMutex(thumbMutex);

if (exists(thumbpath)) {
startLoadThumb(thumbpath, onThumbLoaded, NULL);
int max_w = (int)(screen->w - (screen->w * CFG_getGameArtWidth()));
Expand All @@ -2166,12 +2158,9 @@ int main (int argc, char *argv[]) {
had_thumb = 1;
ox = (int)(max_w) - SCALE1(BUTTON_MARGIN*5);
} else {
SDL_LockMutex(thumbMutex);
if(thumbbmp) SDL_FreeSurface(thumbbmp);
thumbbmp = NULL;
GFX_clearLayers(2);
SDL_UnlockMutex(thumbMutex);
}
SDL_UnlockMutex(thumbMutex);
}

// buttons
Expand Down Expand Up @@ -2295,12 +2284,7 @@ int main (int argc, char *argv[]) {

lastScreen = SCREEN_GAMELIST;
}
SDL_LockMutex(folderBgMutex);
if(bgbmp) {
GFX_drawOnLayer(bgbmp,0, 0, screen->w, screen->h,1.0f,0,1);
}
SDL_UnlockMutex(folderBgMutex);


if(animationdirection > 0) {
// GFX_clearLayers(1);
GFX_clearLayers(2);
Expand All @@ -2315,24 +2299,22 @@ int main (int argc, char *argv[]) {
animationdirection=0;
}
SDL_LockMutex(folderBgMutex);
if(folderbgchanged) {
GFX_clearLayers(1);
if(folderbgbmp && CFG_getRomsUseFolderBackground()) {
GFX_drawOnLayer(folderbgbmp,0, 0, screen->w, screen->h,1.0f,0,1);
folderbgchanged=0;
}

GFX_clearLayers(1);
if(folderbgchanged && folderbgbmp) {
GFX_drawOnLayer(folderbgbmp,0, 0, screen->w, screen->h,1.0f,0,1);
folderbgchanged = 0;
} else if(bgbmp) {
GFX_drawOnLayer(bgbmp,0, 0, screen->w, screen->h,1.0f,0,1);
}
SDL_UnlockMutex(folderBgMutex);
SDL_LockMutex(thumbMutex);
if(thumbbmp && lastScreen == SCREEN_GAMELIST && thumbchanged) {
GFX_clearLayers(2);
int img_w = thumbbmp->w;
int img_h = thumbbmp->h;
double aspect_ratio = (double)img_h / img_w;

int max_w = (int)(screen->w * CFG_getGameArtWidth());
int max_h = (int)(screen->h * 0.6);

int new_w = max_w;
int new_h = (int)(new_w * aspect_ratio);

Expand All @@ -2355,24 +2337,20 @@ int main (int argc, char *argv[]) {
dirty = 0;
readytoscroll = 0;
} else {



// honestly this whole thing is here only for the scrolling text, I set it now to run this at 30fps which is enough for scrolling text, should move this to seperate animation function eventually
Uint32 now = SDL_GetTicks();
Uint32 frame_start = now;
static char cached_display_name[256] = "";
SDL_LockMutex(folderBgMutex);
if(folderbgbmp && CFG_getRomsUseFolderBackground() && folderbgchanged) {
if(folderbgchanged && folderbgbmp) {
GFX_drawOnLayer(folderbgbmp,0, 0, screen->w, screen->h,1.0f,0,1);
PLAT_GPU_Flip();
folderbgchanged=0;
folderbgchanged = 0;
}

SDL_UnlockMutex(folderBgMutex);

SDL_LockMutex(thumbMutex);
if(thumbbmp && thumbchanged) {

GFX_clearLayers(2);
int img_w = thumbbmp->w;
int img_h = thumbbmp->h;
double aspect_ratio = (double)img_h / img_w;
Expand All @@ -2397,7 +2375,6 @@ int main (int argc, char *argv[]) {
int center_y = target_y - (new_h / 2); // FIX: use new_h instead of thumbbmp->h
GFX_clearLayers(2);
GFX_drawOnLayer(thumbbmp,target_x,center_y,new_w,new_h,1.0f,0,2);
PLAT_GPU_Flip();
thumbchanged = 0;
}
SDL_UnlockMutex(thumbMutex);
Expand Down Expand Up @@ -2437,6 +2414,8 @@ int main (int argc, char *argv[]) {
);


} else {
PLAT_GPU_Flip();
}
dirty = 0;
const int fps = 30; // 30fps is more then enough for scrolling text
Expand Down
Loading