Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-09 20:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] all: don't combine the downsampler rules

Browse Source
This commit is contained in:
Geoffrey McRae
2023-11-08 22:52:26 +11:00
parent 905fea57f0
commit d592f13f88
6 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
host/src/downsample_parser.c
View File

@@ -32,10 +32,11 @@ bool downsampleParser(struct Option * opt, const char * str)
opt->value.x_string = strdup(str);
if (downsampleRules.data)
vector_destroy(&downsampleRules);
Vector * downsampleRules = (Vector *)opt->opaque;
if (downsampleRules->data)
vector_destroy(downsampleRules);
if (!vector_create(&downsampleRules, sizeof(DownsampleRule), 10))
if (!vector_create(downsampleRules, sizeof(DownsampleRule), 10))
{
DEBUG_ERROR("Failed to allocate ram");
return false;
@@ -53,6 +54,7 @@ bool downsampleParser(struct Option * opt, const char * str)
++token;
}
rule.module = opt->module;
if (sscanf(token, "%ux%u:%ux%u",
&rule.x,
&rule.y,
@@ -66,7 +68,9 @@ bool downsampleParser(struct Option * opt, const char * str)
rule.id = count++;
DEBUG_INFO(
"Rule %u: %ux%u IF X %s %4u %s Y %s %4u",
"%s:%s rule %u: %ux%u IF X %s %4u %s Y %s %4u",
opt->module,
opt->name,
rule.id,
rule.targetX,
rule.targetY,
@@ -76,7 +80,7 @@ bool downsampleParser(struct Option * opt, const char * str)
rule.greater ? "> " : "==",
rule.y
);
vector_push(&downsampleRules, &rule);
vector_push(downsampleRules, &rule);
token = strtok(NULL, ",");
}
@@ -85,14 +89,20 @@ bool downsampleParser(struct Option * opt, const char * str)
return true;
}
DownsampleRule * downsampleRule_match(int x, int y)
void downsampleCleanup(struct Option * opt)
{
Vector * downsampleRules = (Vector *)opt->opaque;
if (downsampleRules->data)
vector_destroy(downsampleRules);
}
DownsampleRule * downsampleRule_match(Vector * rules, int x, int y)
{
DownsampleRule * rule, * match = NULL;
vector_forEachRef(rule, &downsampleRules)
vector_forEachRef(rule, rules)
{
if (
( rule->greater && (x > rule->x || y > rule->y)) ||
(!rule->greater && (x == rule->x && y == rule->y)))
if (( rule->greater && (x > rule->x || y > rule->y)) ||
(!rule->greater && (x == rule->x && y == rule->y)))
{
match = rule;
}