Skip to content

Fix pinned logo mask matching (stride corruption at load) #8

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
eric merged 2 commits into from
Aug 30, 2026
Merged

Fix pinned logo mask matching (stride corruption at load) #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43236d8
Store loaded logo masks at a fixed stride
Jul 31, 2026
d7e34a7
Index logo masks through one stride everywhere
eric Aug 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
72 changes: 42 additions & 30 deletions comskip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,8 @@ int clogoMaxX;
int clogoMinY;
int clogoMaxY;
unsigned char choriz_edgemask[MAXHEIGHT*MAXWIDTH];
int logo_mask_stride = 0; // row stride of choriz/cvert_edgemask
#define MASK_INDEX(X,Y) ((Y) * (logo_mask_stride > 0 ? logo_mask_stride : width) + (X))
unsigned char cvert_edgemask[MAXHEIGHT*MAXWIDTH];


Expand Down Expand Up @@ -2239,9 +2241,9 @@ void OutputDebugWindow(bool showVideo, int frm, int grf, bool forceRefresh)
{
for (x = clogoMinX; x <= clogoMaxX ; x += edge_step)
{
if (choriz_edgemask[y * width + x]) r = 255;
if (choriz_edgemask[MASK_INDEX(x, y)]) r = 255;
else r = 0;
if (cvert_edgemask[y * width + x]) g = 255;
if (cvert_edgemask[MASK_INDEX(x, y)]) g = 255;
else g = 0;
if (r || g) SETPIXEL(((int)((x-s)/divider)),((int)((y-s)/divider))+barh,r,g,0);
}
Expand Down Expand Up @@ -11331,7 +11333,8 @@ double CheckStationLogoEdge(unsigned char* testFrame)
int goodEdges = 0;

currentGoodEdge = 0.0;
if (videowidth < clogoMinX || height < clogoMinY)
if (videowidth < clogoMinX || height < clogoMinY
|| clogoMaxX + edge_radius >= width || clogoMaxY + edge_radius >= height)
{
// No logo possible as frame size if different from where logo was found
}
Expand All @@ -11341,7 +11344,7 @@ double CheckStationLogoEdge(unsigned char* testFrame)
{
for (x = clogoMinX; x <= clogoMaxX; x += edge_step)
{
index = y * width + x;
index = MASK_INDEX(x, y);
if (choriz_edgemask[index])
{
if (TEST_HEDGE1(testFrame,x,y))
Expand All @@ -11368,7 +11371,7 @@ double CheckStationLogoEdge(unsigned char* testFrame)
{
for (x = clogoMinX; x <= clogoMaxX; x += edge_step)
{
index = y * width + x;
index = MASK_INDEX(x, y);
if (choriz_edgemask[index])
{
if (TEST_HEDGE2(testFrame,x,y))
Expand All @@ -11395,7 +11398,7 @@ double CheckStationLogoEdge(unsigned char* testFrame)
{
for (x = clogoMinX; x <= clogoMaxX; x += edge_step)
{
index = y * width + x;
index = MASK_INDEX(x, y);
if (choriz_edgemask[index])
{
if (TEST_HEDGE3(testFrame,x,y))
Expand All @@ -11422,16 +11425,16 @@ double CheckStationLogoEdge(unsigned char* testFrame)
{
for (x = clogoMinX; x <= clogoMaxX; x += edge_step)
{
index = y * width + x;
if (choriz_edgemask[index] && testFrame[index] < 200)
index = MASK_INDEX(x, y);
if (choriz_edgemask[index] && testFrame[y * width + x] < 200)
{
if (TEST_HEDGE0(testFrame,x,y))
{
goodEdges++;
}
testEdges++;
}
if (cvert_edgemask[index] && testFrame[index] < 200)
if (cvert_edgemask[index] && testFrame[y * width + x] < 200)
{
if (TEST_VEDGE0(testFrame,x,y))
{
Expand All @@ -11448,7 +11451,7 @@ double CheckStationLogoEdge(unsigned char* testFrame)
{
for (x = clogoMinX; x <= clogoMaxX; x += edge_step)
{
index = y * width + x;
index = MASK_INDEX(x, y);
if (choriz_edgemask[index])
{
if (TEST_HEDGE0(testFrame,x,y))
Expand Down Expand Up @@ -12044,6 +12047,7 @@ bool SearchForLogoEdges(void)
clogoMaxY = tlogoMaxY;
memcpy(choriz_edgemask, thoriz_edgemask, width * height);
memcpy(cvert_edgemask, tvert_edgemask, width * height);
logo_mask_stride = width;


logoTrendCounter = num_logo_buffers;
Expand Down Expand Up @@ -12291,17 +12295,17 @@ void DumpEdgeMasks(void)
Debug(1, "%3d: ", y);
for (x = clogoMinX; x <= clogoMaxX; x++)
{
switch (choriz_edgemask[y * width + x])
switch (choriz_edgemask[MASK_INDEX(x, y)])
{
case 0:
if (cvert_edgemask[y * width + x] == 1)
if (cvert_edgemask[MASK_INDEX(x, y)] == 1)
outbuf[x-clogoMinX] = '-';
else
outbuf[x-clogoMinX] = ' ';
break;

case 1:
if (cvert_edgemask[y * width + x] == 1)
if (cvert_edgemask[MASK_INDEX(x, y)] == 1)
outbuf[x-clogoMinX] = '+';
else
outbuf[x-clogoMinX] = '|';
Expand Down Expand Up @@ -12443,17 +12447,17 @@ void SaveLogoMaskData(void)
{
for (x = clogoMinX; x <= clogoMaxX; x++)
{
switch (choriz_edgemask[y * width + x])
switch (choriz_edgemask[MASK_INDEX(x, y)])
{
case 0:
if (cvert_edgemask[y * width + x] == 1)
if (cvert_edgemask[MASK_INDEX(x, y)] == 1)
fprintf(logo_file, "-");
else
fprintf(logo_file, " ");
break;

case 1:
if (cvert_edgemask[y * width + x] == 1)
if (cvert_edgemask[MASK_INDEX(x, y)] == 1)
fprintf(logo_file, "+");
else
fprintf(logo_file, "|");
Expand All @@ -12473,7 +12477,7 @@ void SaveLogoMaskData(void)
{
for (x = clogoMinX; x <= clogoMaxX; x++)
{
switch (choriz_edgemask[y * width + x])
switch (choriz_edgemask[MASK_INDEX(x, y)])
{
case 0:
fprintf(logo_file, " ");
Expand All @@ -12494,7 +12498,7 @@ void SaveLogoMaskData(void)
{
for (x = clogoMinX; x <= clogoMaxX; x++)
{
switch (cvert_edgemask[y * width + x])
switch (cvert_edgemask[MASK_INDEX(x, y)])
{
case 0:
fprintf(logo_file, " ");
Expand Down Expand Up @@ -12546,6 +12550,14 @@ void LoadLogoMaskData(void)
logoInfoAvailable = false;
return;
}
logo_mask_stride = width > 0 ? width : MAXWIDTH;
if (clogoMinX < 0 || clogoMinY < 0 || clogoMaxX < clogoMinX || clogoMaxY < clogoMinY
|| clogoMaxX >= logo_mask_stride || clogoMaxY >= MAXHEIGHT)
{
Debug(0, "Logo file has an invalid logo area, ignoring it.\n");
logoInfoAvailable = false;
return;
}

logo_file = myfopen(logofilename, "r");
/*
Expand Down Expand Up @@ -12577,11 +12589,11 @@ void LoadLogoMaskData(void)
switch (temp)
{
case ' ':
choriz_edgemask[y * width + x] = 0;
choriz_edgemask[MASK_INDEX(x, y)] = 0;
break;

case '|':
choriz_edgemask[y * width + x] = 1;
choriz_edgemask[MASK_INDEX(x, y)] = 1;
break;
}
}
Expand All @@ -12603,11 +12615,11 @@ void LoadLogoMaskData(void)
switch (temp)
{
case ' ':
cvert_edgemask[y * width + x] = 0;
cvert_edgemask[MASK_INDEX(x, y)] = 0;
break;

case '-':
cvert_edgemask[y * width + x] = 1;
cvert_edgemask[MASK_INDEX(x, y)] = 1;
break;
}
}
Expand All @@ -12631,23 +12643,23 @@ void LoadLogoMaskData(void)
switch (temp)
{
case ' ':
choriz_edgemask[y * width + x] = 0;
cvert_edgemask[y * width + x] = 0;
choriz_edgemask[MASK_INDEX(x, y)] = 0;
cvert_edgemask[MASK_INDEX(x, y)] = 0;
break;

case '-':
choriz_edgemask[y * width + x] = 0;
cvert_edgemask[y * width + x] = 1;
choriz_edgemask[MASK_INDEX(x, y)] = 0;
cvert_edgemask[MASK_INDEX(x, y)] = 1;
break;

case '|':
choriz_edgemask[y * width + x] = 1;
cvert_edgemask[y * width + x] = 0;
choriz_edgemask[MASK_INDEX(x, y)] = 1;
cvert_edgemask[MASK_INDEX(x, y)] = 0;
break;

case '+':
choriz_edgemask[y * width + x] = 1;
cvert_edgemask[y * width + x] = 1;
choriz_edgemask[MASK_INDEX(x, y)] = 1;
cvert_edgemask[MASK_INDEX(x, y)] = 1;
break;

}
Expand Down
Loading