Allow VAAPI encoding GPU to be manually specified when using VRAM cap…

…ture
LizardByte · Jan 21, 2024 · b6b2a29 · b6b2a29
1 parent 6e64398
commit b6b2a29
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
@@ -568,6 +568,8 @@ keybindings
       **Linux + VA-API**
          Unlike with `amdvce` and `nvenc`, it doesn't matter if video encoding is done on a different GPU.
 
+         .. note:: This MUST be a render node (renderD*) not a primary node (card*).
+
          .. code-block:: bash
 
             ls /dev/dri/renderD*  # to find all devices capable of VAAPI

diff --git a/src/platform/linux/kmsgrab.cpp b/src/platform/linux/kmsgrab.cpp
@@ -14,6 +14,7 @@
 
 #include <filesystem>
 
+#include "src/config.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 #include "src/round_robin.h"
@@ -292,17 +293,30 @@ namespace platf {
           return -1;
         }
 
-        // Open the render node for this card to share with libva.
-        // If it fails, we'll just share the primary node instead.
-        char *rendernode_path = drmGetRenderDeviceNameFromFd(fd.el);
-        if (rendernode_path) {
+        // The render node will be used for color conversion and encoding operations
+        std::string rendernode_path = config::video.adapter_name;
+        if (rendernode_path.empty()) {
+          char *rendernode_cstr = drmGetRenderDeviceNameFromFd(fd.el);
+          if (rendernode_cstr) {
+            rendernode_path.assign(rendernode_cstr);
+            free(rendernode_cstr);
+
+            BOOST_LOG(info) << "Using capture adapter for encoding: "sv << path << " -> "sv << rendernode_path;
+          }
+          else {
+            BOOST_LOG(info) << "Capture adapter has no render node: "sv << path;
+          }
+        }
+        else {
+          BOOST_LOG(info) << "Using manually selected adapter for encoding: "sv << path << " -> "sv << rendernode_path;
+        }
+        if (!rendernode_path.empty()) {
           BOOST_LOG(debug) << "Opening render node: "sv << rendernode_path;
-          render_fd.el = open(rendernode_path, O_RDWR);
+          render_fd.el = open(rendernode_path.c_str(), O_RDWR);
           if (render_fd.el < 0) {
             BOOST_LOG(warning) << "Couldn't open render node: "sv << rendernode_path << ": "sv << strerror(errno);
             render_fd.el = dup(fd.el);
           }
-          free(rendernode_path);
         }
 
         if (drmSetClientCap(fd.el, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
@@ -455,7 +455,7 @@ <h2 class="accordion-header">
           <label for="adapter_name" class="form-label">Adapter Name</label>
           <input class="form-control" id="adapter_name" placeholder="/dev/dri/renderD128" v-model="config.adapter_name" />
           <div class="form-text">
-            Manually specify a GPU to use for capture.<br>
+            Manually specify a GPU to use for encoding. This MUST be a render node (renderD*) not a primary node (card*).<br>
             <pre>ls /dev/dri/renderD*  # to find all devices capable of VAAPI</pre>
             <pre>
               vainfo --display drm --device /dev/dri/renderD129 | \