From 2b02cb149d89f0fd17179b27f0429eba0f502feb Mon Sep 17 00:00:00 2001
From: KuleRucket <luke.d.tucker@gmail.com>
Date: Fri, 24 Mar 2023 01:58:50 +0100
Subject: [PATCH 01/11] Provide ability to force a capture method via
 configuration.

---
 src/config.cpp                           |  2 ++
 src/config.h                             |  1 +
 src/platform/linux/misc.cpp              | 38 ++++++++++++++++--------
 src_assets/common/assets/web/config.html | 17 ++++++++++-
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index 71b90df841f..ffe17904dc2 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -351,6 +351,7 @@ video_t video {
     -1,
   }, // vt
 
+  {},  // capture method
   {},  // encoder
   {},  // adapter_name
   {},  // output_name
@@ -882,6 +883,7 @@ void apply_config(std::unordered_map<std::string, std::string> &&vars) {
   int_f(vars, "vt_software", video.vt.vt_require_sw, vt::force_software_from_view);
   int_f(vars, "vt_realtime", video.vt.vt_realtime, vt::rt_from_view);
 
+  string_f(vars, "capture", video.capture);
   string_f(vars, "encoder", video.encoder);
   string_f(vars, "adapter_name", video.adapter_name);
   string_f(vars, "output_name", video.output_name);
diff --git a/src/config.h b/src/config.h
index 2a4a638ad93..2e82ec01b5c 100644
--- a/src/config.h
+++ b/src/config.h
@@ -52,6 +52,7 @@ struct video_t {
     int vt_coder;
   } vt;
 
+  std::string capture;;
   std::string encoder;
   std::string adapter_name;
   std::string output_name;
diff --git a/src/platform/linux/misc.cpp b/src/platform/linux/misc.cpp
index 081fb534156..a41bf2f3b65 100644
--- a/src/platform/linux/misc.cpp
+++ b/src/platform/linux/misc.cpp
@@ -8,13 +8,15 @@
 
 #include <fstream>
 
+// local includes
 #include "graphics.h"
 #include "misc.h"
 #include "vaapi.h"
-
+#include "src/config.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 
+// lib includes
 #include <boost/asio/ip/address.hpp>
 #include <boost/process.hpp>
 
@@ -518,34 +520,44 @@ std::unique_ptr<deinit_t> init() {
     window_system = window_system_e::X11;
   }
 #endif
+
 #ifdef SUNSHINE_BUILD_CUDA
-  if(verify_nvfbc()) {
-    sources[source::NVFBC] = true;
+  if(config::video.capture.empty() || config::video.capture == "nvfbc") {
+    if(verify_nvfbc()) {
+      sources[source::NVFBC] = true;
+    }
   }
 #endif
 #ifdef SUNSHINE_BUILD_WAYLAND
-  if(verify_wl()) {
-    sources[source::WAYLAND] = true;
+  if(config::video.capture.empty() || config::video.capture == "wlr") {
+    if(verify_wl()) {
+      sources[source::WAYLAND] = true;
+    }
   }
 #endif
 #ifdef SUNSHINE_BUILD_DRM
-  if(verify_kms()) {
-    if(window_system == window_system_e::WAYLAND) {
-      // On Wayland, using KMS, the cursor is unreliable.
-      // Hide it by default
-      display_cursor = false;
+  if(config::video.capture.empty() || config::video.capture == "kms") {
+    if(verify_kms()) {
+      if(window_system == window_system_e::WAYLAND) {
+        // On Wayland, using KMS, the cursor is unreliable.
+        // Hide it by default
+        display_cursor = false;
+      }
     }
 
     sources[source::KMS] = true;
   }
 #endif
 #ifdef SUNSHINE_BUILD_X11
-  if(verify_x11()) {
-    sources[source::X11] = true;
+  if(config::video.capture.empty() || config::video.capture == "x11") {
+    if(verify_x11()) {
+      sources[source::X11] = true;
+    }
   }
 #endif
 
   if(sources.none()) {
+    BOOST_LOG(error) << "Unable to initialize capture method";
     return nullptr;
   }
 
@@ -555,4 +567,4 @@ std::unique_ptr<deinit_t> init() {
 
   return std::make_unique<deinit_t>();
 }
-} // namespace platf
\ No newline at end of file
+} // namespace platf
diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index a0b4f64f75f..0f9ead623b1 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -591,7 +591,21 @@ <h1 class="my-4">Configuration</h1>
           HEVC is more CPU-intensive to encode, so enabling this may reduce performance when using software encoding.
         </div>
       </div>
-      <!--Encoder -->
+      <!--Capture-->
+      <div class="mb-3" v-if="platform === 'linux'">
+        <label for="capture" class="form-label">Force a Specific Capture Method</label>
+        <select id="capture" class="form-select" v-model="config.capture">
+          <option value>Autodetect</option>
+          <option value="nvfbc">NvFBC</option>
+          <option value="wlr">wlroots</option>
+          <option value="kms">KMS</option>
+          <option value="x11">X11</option>
+        </select>
+        <div class="form-text">
+          Force a specific capture method, otherwise Sunshine will use the first one that works. NvFBC requires patched nvidia drivers.
+        </div>
+      </div>
+      <!--Encoder-->
       <div class="mb-3">
         <label for="encoder" class="form-label">Force a Specific Encoder</label>
         <select id="encoder" class="form-select" v-model="config.encoder">
@@ -911,6 +925,7 @@ <h1 class="my-4">Configuration</h1>
     "amd_rc": "vbr_latency",
     "amd_usage": "ultralowlatency",
     "amd_vbaq": "enabled",
+    "capture": "",
     "controller": "enabled",
     "dwmflush": "enabled",
     "encoder": "",

From 5808e9eb6ee3c9818c8161e5544c4c737e054740 Mon Sep 17 00:00:00 2001
From: KuleRucket <luke.d.tucker@gmail.com>
Date: Fri, 24 Mar 2023 02:09:00 +0100
Subject: [PATCH 02/11] remove extra ;

---
 src/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config.h b/src/config.h
index 2e82ec01b5c..3a2ff822028 100644
--- a/src/config.h
+++ b/src/config.h
@@ -52,7 +52,7 @@ struct video_t {
     int vt_coder;
   } vt;
 
-  std::string capture;;
+  std::string capture;
   std::string encoder;
   std::string adapter_name;
   std::string output_name;

From ff55fb1ad623153b158bd4bfa91e3dae7ffaeafe Mon Sep 17 00:00:00 2001
From: KuleRucket <737724+KuleRucket@users.noreply.github.com>
Date: Fri, 24 Mar 2023 09:21:55 +0100
Subject: [PATCH 03/11] Add documentation for capture setting

---
 docs/source/about/advanced_usage.rst | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
index 59d244659df..1c554f8b80f 100644
--- a/docs/source/about/advanced_usage.rst
+++ b/docs/source/about/advanced_usage.rst
@@ -752,6 +752,36 @@ hevc_mode
 
       hevc_mode = 2
 
+capture
+^^^^^^^
+
+**Description**
+   Force specific screen capture method. If set to automatic then Sunshine will attempt to find a capture method in the order of the table below, otherwise it will only attempt to capture via the method specified.
+
+   .. Caution:: Applies to Linux only.
+
+**Choices**
+
+.. table::
+   :widths: auto
+
+   =========  ===========
+   Value      Description
+   =========  ===========
+   nvfbc      Use NVIDIA Frame Buffer Capture to capture direct to GPU memory. This is usually the fastest method for NVIDIA cards. For GeForce cards it will only work with drivers patched with `nvidia-patch <https://github.com/keylase/nvidia-patch/>`_ or `nvlax <https://github.com/keylase/nvidia-patch/>`_.
+   wlr        Capture for wlroots based Wayland compositors via DMA-BUF.
+   kms        DRM/KMS screen capture from the kernel. This requires that sunshine has cap_sys_admin capability. See :ref:`Linux Setup <about/usage:setup`.
+   x11        Uses XCB. This is the slowest and most CPU intensive so should be avoided if possible.
+   =========  ===========
+   
+**Default**
+   Automatic
+
+**Example**
+   .. code-block:: text
+
+      capture = kms
+      
 encoder
 ^^^^^^^
 

From 71b20ef2dd0ec2397da4deddbf77b9a00950b687 Mon Sep 17 00:00:00 2001
From: KuleRucket <737724+KuleRucket@users.noreply.github.com>
Date: Fri, 24 Mar 2023 09:29:43 +0100
Subject: [PATCH 04/11] Move description of default to Default section

---
 docs/source/about/advanced_usage.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
index 1c554f8b80f..6254ca569dc 100644
--- a/docs/source/about/advanced_usage.rst
+++ b/docs/source/about/advanced_usage.rst
@@ -756,7 +756,7 @@ capture
 ^^^^^^^
 
 **Description**
-   Force specific screen capture method. If set to automatic then Sunshine will attempt to find a capture method in the order of the table below, otherwise it will only attempt to capture via the method specified.
+   Force specific screen capture method.
 
    .. Caution:: Applies to Linux only.
 
@@ -775,7 +775,7 @@ capture
    =========  ===========
    
 **Default**
-   Automatic
+   Automatic. Sunshine will use the first capture method available in the order of the table above.
 
 **Example**
    .. code-block:: text

From 6d42adc9ea802eb78a9d097b62e752a3283dcec7 Mon Sep 17 00:00:00 2001
From: KuleRucket <737724+KuleRucket@users.noreply.github.com>
Date: Fri, 24 Mar 2023 15:23:50 +0100
Subject: [PATCH 05/11] fix missing >

---
 docs/source/about/advanced_usage.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
index 6254ca569dc..fca86573d4c 100644
--- a/docs/source/about/advanced_usage.rst
+++ b/docs/source/about/advanced_usage.rst
@@ -770,7 +770,7 @@ capture
    =========  ===========
    nvfbc      Use NVIDIA Frame Buffer Capture to capture direct to GPU memory. This is usually the fastest method for NVIDIA cards. For GeForce cards it will only work with drivers patched with `nvidia-patch <https://github.com/keylase/nvidia-patch/>`_ or `nvlax <https://github.com/keylase/nvidia-patch/>`_.
    wlr        Capture for wlroots based Wayland compositors via DMA-BUF.
-   kms        DRM/KMS screen capture from the kernel. This requires that sunshine has cap_sys_admin capability. See :ref:`Linux Setup <about/usage:setup`.
+   kms        DRM/KMS screen capture from the kernel. This requires that sunshine has cap_sys_admin capability. See :ref:`Linux Setup <about/usage:setup>`.
    x11        Uses XCB. This is the slowest and most CPU intensive so should be avoided if possible.
    =========  ===========
    

From be75f240181b1692f14ce74be766ded78be78581 Mon Sep 17 00:00:00 2001
From: KuleRucket <luke.d.tucker@gmail.com>
Date: Sat, 25 Mar 2023 22:29:01 +0100
Subject: [PATCH 06/11] order includes and add doxygen header

---
 src/platform/linux/misc.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/platform/linux/misc.cpp b/src/platform/linux/misc.cpp
index a41bf2f3b65..282b04720eb 100644
--- a/src/platform/linux/misc.cpp
+++ b/src/platform/linux/misc.cpp
@@ -1,3 +1,11 @@
+/**
+ * @file misc.cpp
+ */
+
+// standard includes
+#include <fstream>
+
+// lib includes
 #include <arpa/inet.h>
 #include <dlfcn.h>
 #include <fcntl.h>
@@ -5,8 +13,8 @@
 #include <netinet/udp.h>
 #include <pwd.h>
 #include <unistd.h>
-
-#include <fstream>
+#include <boost/asio/ip/address.hpp>
+#include <boost/process.hpp>
 
 // local includes
 #include "graphics.h"
@@ -16,10 +24,6 @@
 #include "src/main.h"
 #include "src/platform/common.h"
 
-// lib includes
-#include <boost/asio/ip/address.hpp>
-#include <boost/process.hpp>
-
 #ifdef __GNUC__
 #define SUNSHINE_GNUC_EXTENSION __extension__
 #else

From 4ef21e3c8064b16463d40abd6b0c84cd12d0a04f Mon Sep 17 00:00:00 2001
From: KuleRucket <luke.d.tucker@gmail.com>
Date: Sat, 25 Mar 2023 22:29:50 +0100
Subject: [PATCH 07/11] set value=""

---
 src_assets/common/assets/web/config.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 0f9ead623b1..f4ea4171f25 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -595,7 +595,7 @@ <h1 class="my-4">Configuration</h1>
       <div class="mb-3" v-if="platform === 'linux'">
         <label for="capture" class="form-label">Force a Specific Capture Method</label>
         <select id="capture" class="form-select" v-model="config.capture">
-          <option value>Autodetect</option>
+          <option value="">Autodetect</option>
           <option value="nvfbc">NvFBC</option>
           <option value="wlr">wlroots</option>
           <option value="kms">KMS</option>
@@ -609,7 +609,7 @@ <h1 class="my-4">Configuration</h1>
       <div class="mb-3">
         <label for="encoder" class="form-label">Force a Specific Encoder</label>
         <select id="encoder" class="form-select" v-model="config.encoder">
-          <option value>Autodetect</option>
+          <option value="">Autodetect</option>
           <option value="nvenc" v-if="platform === 'windows' || platform === 'linux'">NVIDIA NVENC</option>
           <option value="quicksync" v-if="platform === 'windows'">Intel QuickSync</option>
           <option value="amdvce" v-if="platform === 'windows'">AMD AMF/VCE</option>

From 583587df6e29f728f337baacb09a7286c1cfa8ba Mon Sep 17 00:00:00 2001
From: KuleRucket <luke.d.tucker@gmail.com>
Date: Sat, 25 Mar 2023 22:31:13 +0100
Subject: [PATCH 08/11] align comment to setting name

---
 src/config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config.cpp b/src/config.cpp
index ffe17904dc2..89c7dba1917 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -351,7 +351,7 @@ video_t video {
     -1,
   }, // vt
 
-  {},  // capture method
+  {},  // capture
   {},  // encoder
   {},  // adapter_name
   {},  // output_name

From b0e3abeb66964cea1a189c9db339eac83d8c9928 Mon Sep 17 00:00:00 2001
From: KuleRucket <737724+KuleRucket@users.noreply.github.com>
Date: Sat, 25 Mar 2023 22:37:57 +0100
Subject: [PATCH 09/11] Readability improvements

---
 docs/source/about/advanced_usage.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
index fca86573d4c..3f4cd2ee9b2 100644
--- a/docs/source/about/advanced_usage.rst
+++ b/docs/source/about/advanced_usage.rst
@@ -768,9 +768,13 @@ capture
    =========  ===========
    Value      Description
    =========  ===========
-   nvfbc      Use NVIDIA Frame Buffer Capture to capture direct to GPU memory. This is usually the fastest method for NVIDIA cards. For GeForce cards it will only work with drivers patched with `nvidia-patch <https://github.com/keylase/nvidia-patch/>`_ or `nvlax <https://github.com/keylase/nvidia-patch/>`_.
+   nvfbc      Use NVIDIA Frame Buffer Capture to capture direct to GPU memory. This is usually the fastest method for
+              NVIDIA cards. For GeForce cards it will only work with drivers patched with
+              `nvidia-patch <https://github.com/keylase/nvidia-patch/>`_
+              or `nvlax <https://github.com/keylase/nvidia-patch/>`_.
    wlr        Capture for wlroots based Wayland compositors via DMA-BUF.
-   kms        DRM/KMS screen capture from the kernel. This requires that sunshine has cap_sys_admin capability. See :ref:`Linux Setup <about/usage:setup>`.
+   kms        DRM/KMS screen capture from the kernel. This requires that sunshine has cap_sys_admin capability.
+              See :ref:`Linux Setup <about/usage:setup>`.
    x11        Uses XCB. This is the slowest and most CPU intensive so should be avoided if possible.
    =========  ===========
    

From f5f9e869a96cae5a13632a9f03fb2e27305199fa Mon Sep 17 00:00:00 2001
From: KuleRucket <luke.d.tucker@gmail.com>
Date: Sat, 25 Mar 2023 22:59:10 +0100
Subject: [PATCH 10/11] add string_view literal

---
 src/platform/linux/misc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platform/linux/misc.cpp b/src/platform/linux/misc.cpp
index 282b04720eb..9b9997cffc9 100644
--- a/src/platform/linux/misc.cpp
+++ b/src/platform/linux/misc.cpp
@@ -561,7 +561,7 @@ std::unique_ptr<deinit_t> init() {
 #endif
 
   if(sources.none()) {
-    BOOST_LOG(error) << "Unable to initialize capture method";
+    BOOST_LOG(error) << "Unable to initialize capture method"sv;
     return nullptr;
   }
 

From 01462719e5ed0de4d054a54a8d3bf07f1580ecbf Mon Sep 17 00:00:00 2001
From: KuleRucket <luke.d.tucker@gmail.com>
Date: Sun, 26 Mar 2023 01:42:56 +0100
Subject: [PATCH 11/11] lint fix

---
 src/platform/linux/misc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/platform/linux/misc.cpp b/src/platform/linux/misc.cpp
index 9b9997cffc9..01a7bf60d08 100644
--- a/src/platform/linux/misc.cpp
+++ b/src/platform/linux/misc.cpp
@@ -7,22 +7,22 @@
 
 // lib includes
 #include <arpa/inet.h>
+#include <boost/asio/ip/address.hpp>
+#include <boost/process.hpp>
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <netinet/udp.h>
 #include <pwd.h>
 #include <unistd.h>
-#include <boost/asio/ip/address.hpp>
-#include <boost/process.hpp>
 
 // local includes
 #include "graphics.h"
 #include "misc.h"
-#include "vaapi.h"
 #include "src/config.h"
 #include "src/main.h"
 #include "src/platform/common.h"
+#include "vaapi.h"
 
 #ifdef __GNUC__
 #define SUNSHINE_GNUC_EXTENSION __extension__