Skip to content

Fix monochrome for real :) #23

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
mkalkbrenner merged 4 commits into from
May 30, 2026
Merged

Fix monochrome for real :) #23

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c26194
revert to a state from earlier
PastorL69 May 29, 2026
0be4949
redo comment as behaviour has changed.
PastorL69 May 29, 2026
def5b12
reverse the order, checking monochrome state first is quicker
PastorL69 May 29, 2026
ffeb0e8
same black frame/monochrome logic for v1
PastorL69 May 30, 2026
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
49 changes: 21 additions & 28 deletions src/serum-decode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4402,25 +4402,22 @@ uint32_t Serum_ColorizeWithMetadatav1(uint8_t* frame) {
if (showStatusMessages) ignoreUnknownFramesTimeout = 0x2000;
}
if (frameID != IDENTIFY_NO_FRAME && !showStatusMessages) {
// Ignore any triggers for full black frames as they appear in-game and in
// monochrome settings mode and we don't know what authors did with them
// (accidentally). Black frames in-game should be shown. In monochrome
// settings mode, they should not end the monochrome mode.
if (!IsFullBlackFrame(frame, g_serumData.fwidth * g_serumData.fheight)) {
// Black frames can distort a monochrome stream. Example: flashing text in
// a WPC settings menu. This could trigger a random black frame in the
// project, if this black frame doesn't have the appropriate monochrome
// trigger, it would end the monochrome stream and stay stuck on a black
// frame until a frame in the project is detected again. The code below
// takes care of that.
if ((!monochromeMode && !monochromePaletteMode) ||
!IsFullBlackFrame(frame, g_serumData.fwidth * g_serumData.fheight)) {
monochromeMode =
(g_serumData.triggerIDs[lastfound][0] == MONOCHROME_TRIGGER_ID);
monochromePaletteMode = false;
if (g_serumData.triggerIDs[lastfound][0] > 0xff98)
g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
} else {
if (monochromeMode)
g_serumData.triggerIDs[lastfound][0] = MONOCHROME_TRIGGER_ID;
else if (monochromePaletteMode)
g_serumData.triggerIDs[lastfound][0] = MONOCHROME_PALETTE_TRIGGER_ID;
else
g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
}

if (g_serumData.triggerIDs[lastfound][0] > 0xff98)
g_serumData.triggerIDs[lastfound][0] = 0xffffffff;

lastframe_found = now;
if (maxFramesToSkip) {
framesSkippedCounter = 0;
Expand Down Expand Up @@ -4716,11 +4713,14 @@ static uint32_t Serum_ColorizeWithMetadatav2Internal(uint8_t* frame,
if (showStatusMessages) ignoreUnknownFramesTimeout = 0x2000;
}
if (frameID != IDENTIFY_NO_FRAME && !showStatusMessages) {
// Ignore any triggers for full black frames as they appear in-game and in
// monochrome settings mode and we don't know what authors did with them
// (accidentally). Black frames in-game should be shown. In monochrome
// settings mode, they should not end the monochrome mode.
if (!IsFullBlackFrame(frame, g_serumData.fwidth * g_serumData.fheight)) {
// Black frames can distort a monochrome stream. Example: flashing text in
// a WPC settings menu. This could trigger a random black frame in the
// project, if this black frame doesn't have the appropriate monochrome
// trigger, it would end the monochrome stream and stay stuck on a black
// frame until a frame in the project is detected again. The code below
// takes care of that.
if ((!monochromeMode && !monochromePaletteMode) ||
!IsFullBlackFrame(frame, g_serumData.fwidth * g_serumData.fheight)) {
monochromeMode =
(g_serumData.triggerIDs[lastfound][0] == MONOCHROME_TRIGGER_ID);
monochromePaletteMode = false;
Expand All @@ -4729,16 +4729,9 @@ static uint32_t Serum_ColorizeWithMetadatav2Internal(uint8_t* frame,
monochromePaletteMode = CaptureMonochromePaletteFromFrameV2(lastfound);
monochromeMode = false;
}
if (g_serumData.triggerIDs[lastfound][0] > 0xff98)
g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
} else {
if (monochromeMode)
g_serumData.triggerIDs[lastfound][0] = MONOCHROME_TRIGGER_ID;
else if (monochromePaletteMode)
g_serumData.triggerIDs[lastfound][0] = MONOCHROME_PALETTE_TRIGGER_ID;
else
g_serumData.triggerIDs[lastfound][0] = 0xffffffff;
}
if (g_serumData.triggerIDs[lastfound][0] > 0xff98)
g_serumData.triggerIDs[lastfound][0] = 0xffffffff;

if (!monochromeMode && g_serumData.sceneGenerator->isActive() &&
!sceneFrameRequested &&
Expand Down
Loading