[host] downsample: fix failure to match only the backend selected

gnif · Nov 8, 2023 · 5e93b70 · 5e93b70
1 parent 46781ee
commit 5e93b70
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/host/include/downsample_parser.h b/host/include/downsample_parser.h
@@ -24,6 +24,7 @@
 
 typedef struct
 {
+  const char * module;
   unsigned int id;
   bool         greater;
   unsigned int x;
@@ -37,7 +38,7 @@ extern Vector downsampleRules;
 
 bool downsampleParser(struct Option * opt, const char * str);
 
-DownsampleRule * downsampleRule_match(int x, int y);
+DownsampleRule * downsampleRule_match(const char * module, int x, int y);
 
 #define DOWNSAMPLE_PARSER(moduleName) \
 { \

diff --git a/host/platform/Windows/capture/DXGI/src/pp/downsample.c b/host/platform/Windows/capture/DXGI/src/pp/downsample.c
@@ -99,7 +99,7 @@ static bool downsample_configure(void * opaque,
 
   if (!this.pshader)
   {
-    DownsampleRule * rule = downsampleRule_match(*width, *height);
+    DownsampleRule * rule = downsampleRule_match("dxgi", *width, *height);
     if (!rule || (rule->targetX == *width && rule->targetY == *height))
     {
       this.disabled = true;

diff --git a/host/platform/Windows/capture/NVFBC/src/nvfbc.c b/host/platform/Windows/capture/NVFBC/src/nvfbc.c
@@ -202,7 +202,8 @@ static bool nvfbc_create(
 
 static void updateScale(void)
 {
-  DownsampleRule * rule = downsampleRule_match(this->width, this->height);
+  DownsampleRule * rule = downsampleRule_match("nvfbc",
+    this->width, this->height);
   if (rule)
   {
     this->scale        = true;

diff --git a/host/src/downsample_parser.c b/host/src/downsample_parser.c
@@ -53,6 +53,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,
@@ -85,14 +86,15 @@ bool downsampleParser(struct Option * opt, const char * str)
   return true;
 }
 
-DownsampleRule * downsampleRule_match(int x, int y)
+DownsampleRule * downsampleRule_match(const char * module, int x, int y)
 {
   DownsampleRule * rule, * match = NULL;
   vector_forEachRef(rule, &downsampleRules)
   {
-    if (
-      ( rule->greater && (x  > rule->x || y  > rule->y)) ||
-      (!rule->greater && (x == rule->x && y == rule->y)))
+    if (strcmp(rule->module, module) == 0 && (
+        ( rule->greater && (x  > rule->x || y  > rule->y)) ||
+        (!rule->greater && (x == rule->x && y == rule->y)))
+      )
     {
       match = rule;
     }