Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

image loader: avoid message flood on error

Browse Source 
in case that several "bad" image effect segments competing to use the GIF decoder, we had a flood of repeating user_print messages
This commit is contained in:
Frank
2025-11-17 14:27:08 +01:00
parent eab946ea87
commit d6ee51841b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wled00/image_loader.cpp
View File

@@ -167,7 +167,7 @@ byte renderImageToSegment(Segment &seg) {
size_t fnameLen = strlen(lastFilename); size_t fnameLen = strlen(lastFilename);
if ((fnameLen < 4) || strcmp(lastFilename + fnameLen - 4, ".gif") != 0) { // empty segment name, name too short, or name not ending in .gif if ((fnameLen < 4) || strcmp(lastFilename + fnameLen - 4, ".gif") != 0) { // empty segment name, name too short, or name not ending in .gif
gifDecodeFailed = true; gifDecodeFailed = true;
USER_PRINTF("GIF decoder unsupported file: %s\n", lastFilename); DEBUG_PRINTF("GIF decoder unsupported file: %s\n", lastFilename); // can cause message flood if two segments compete over one decoder instance
return IMAGE_ERROR_UNSUPPORTED_FORMAT; return IMAGE_ERROR_UNSUPPORTED_FORMAT;
} }
@@ -221,6 +221,7 @@ byte renderImageToSegment(Segment &seg) {
USER_PRINTF("Invalid GIF dimensions: %dx%d\n", gifWidth, gifHeight); USER_PRINTF("Invalid GIF dimensions: %dx%d\n", gifWidth, gifHeight);
return IMAGE_ERROR_GIF_DECODE; return IMAGE_ERROR_GIF_DECODE;
} }
USER_PRINTF("Started GIF decoding %dx%d pixels -> %dx%d Segment\n", gifWidth, gifHeight, segCols, segRows);
calculateScaling(); calculateScaling();
} }
@@ -262,7 +263,7 @@ void endImagePlayback(Segment *seg) {
if (!activeSeg || activeSeg != seg) return; if (!activeSeg || activeSeg != seg) return;
if (file) file.close(); if (file) file.close();
decoder.dealloc(); decoder.dealloc();
gifWidth = 0; gifHeight = 0; // WLEDMM clear cached image dimensions gifWidth = 0; gifHeight = 0; // clear cached image dimensions
gifDecodeFailed = false; gifDecodeFailed = false;
activeSeg = nullptr; activeSeg = nullptr;
strcpy(lastFilename, "/"); // reset filename strcpy(lastFilename, "/"); // reset filename