From 09ef8a1266a245038870f47d27ebbe47284029cb Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 4 Jan 2023 00:15:27 -0600
Subject: [PATCH 1/8] Clarify that the min_threads value only affects software
 encoding

---
 docs/source/about/advanced_usage.rst     | 2 +-
 src_assets/common/assets/web/config.html | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
index ab46db3a27f..ec8b5a41a7f 100644
--- a/docs/source/about/advanced_usage.rst
+++ b/docs/source/about/advanced_usage.rst
@@ -683,7 +683,7 @@ min_threads
 ^^^^^^^^^^^
 
 **Description**
-   Minimum number of threads used by ffmpeg to encode the video.
+   Minimum number of threads used for software encoding.
 
    .. Note:: Increasing the value slightly reduces encoding efficiency, but the tradeoff is usually worth it to gain
       the use of more CPU cores for encoding. The ideal value is the lowest value that can reliably encode at your
diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 849ccac626a..3d852d2f31d 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -479,7 +479,7 @@ <h1 class="my-4">Configuration</h1>
       <!-- Min Threads -->
       <div class="mb-3">
         <label for="min_threads" class="form-label"
-          >Minimum number of threads used by ffmpeg to encode the video.</label
+          >Minimum Software Encoding Thread Count</label
         >
         <input
           type="number"
@@ -490,7 +490,6 @@ <h1 class="my-4">Configuration</h1>
           v-model="config.min_threads"
         />
         <div class="form-text">
-          Minimum number of threads used by ffmpeg to encode the video.<br />
           Increasing the value slightly reduces encoding efficiency, but the tradeoff is usually<br />
           worth it to gain the use of more CPU cores for encoding. The ideal value is the lowest<br />
           value that can reliably encode at your desired streaming settings on your hardware.

From 2113a79b2ad94e8f4019eeb1f374371c0a321c11 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 4 Jan 2023 00:16:49 -0600
Subject: [PATCH 2/8] Add "AMD" to the AMF encoder title

---
 src_assets/common/assets/web/config.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 3d852d2f31d..3949803ba1e 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -815,7 +815,7 @@ <h1 class="my-4">Configuration</h1>
           },
           {
             id: "amd",
-            name: "AMF Encoder",
+            name: "AMD AMF Encoder",
           },
           {
             id: "va-api",

From e13389f86764a5eb127fa6544148aefc5ed97c25 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 4 Jan 2023 00:17:43 -0600
Subject: [PATCH 3/8] Hide tabs for encoders that are not available

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

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 3949803ba1e..e9b3f27afc4 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -838,12 +838,17 @@ <h1 class="my-4">Configuration</h1>
           var app = document.getElementById("app");
           if (this.platform == "windows") {
             this.tabs = this.tabs.filter((el) => {
-              return el.id !== "va-api";
+              return el.id !== "va-api" && el.id !== "vt";
             });
           }
           if (this.platform == "linux") {
             this.tabs = this.tabs.filter((el) => {
-              return el.id !== "amd";
+              return el.id !== "amd" && el.id !== "vt";
+            });
+          }
+          if (this.platform == "macos") {
+            this.tabs = this.tabs.filter((el) => {
+              return el.id !== "amd" && el.id !== "va-api" && el.id !== "nv";
             });
           }
 

From 98cc2e8ab2db50413f7d85cfeff14087160b61a6 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 4 Jan 2023 00:21:25 -0600
Subject: [PATCH 4/8] Fix QP misspelling

---
 docs/source/about/advanced_usage.rst     | 2 +-
 src_assets/common/assets/web/config.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
index ec8b5a41a7f..f208772889d 100644
--- a/docs/source/about/advanced_usage.rst
+++ b/docs/source/about/advanced_usage.rst
@@ -667,7 +667,7 @@ qp
 ^^
 
 **Description**
-   Quantitization Parameter. Some devices don't support Constant Bit Rate. For those devices, QP is used instead.
+   Quantization Parameter. Some devices don't support Constant Bit Rate. For those devices, QP is used instead.
 
    .. Warning:: Higher value means more compression, but less quality.
 
diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index e9b3f27afc4..578fb6500bb 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -461,7 +461,7 @@ <h1 class="my-4">Configuration</h1>
       </div>
       <!-- Quantization Parameter -->
       <div class="mb-3">
-        <label for="qp" class="form-label">Quantitization Parameter</label>
+        <label for="qp" class="form-label">Quantization Parameter</label>
         <input
           type="number"
           class="form-control"
@@ -470,7 +470,7 @@ <h1 class="my-4">Configuration</h1>
           v-model="config.qp"
         />
         <div class="form-text">
-          Quantitization Parameter<br />
+          Quantization Parameter<br />
           Some devices may not support Constant Bit Rate.<br />
           For those devices, QP is used instead.<br />
           Higher value means more compression, but less quality<br />

From 2436bd2d150e94261add82fd450b1b93171d87c4 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 4 Jan 2023 00:31:35 -0600
Subject: [PATCH 5/8] Sort encoder tabs in priority order

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

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 578fb6500bb..ab58f4a74dc 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -726,6 +726,7 @@ <h1 class="my-4">Configuration</h1>
         </select>
       </div>
     </div>
+    <!--VA-API Encoder Settings-->
     <div v-if="currentTab === 'va-api'" class="config-page">
       <input
         class="form-control"
@@ -805,10 +806,6 @@ <h1 class="my-4">Configuration</h1>
             id: "advanced",
             name: "Advanced",
           },
-          {
-            id: "sw",
-            name: "Software Encoder",
-          },
           {
             id: "nv",
             name: "NVENC Encoder",
@@ -825,6 +822,10 @@ <h1 class="my-4">Configuration</h1>
             id: "vt",
             name: "VideoToolbox encoder",
           },
+          {
+            id: "sw",
+            name: "Software Encoder",
+          },
         ],
       };
     },

From 1a7cdb70cb9f4ebe43016c429f31ba1abf051363 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 4 Jan 2023 17:06:23 -0600
Subject: [PATCH 6/8] Standardize NVENC name and and capitalization for VT and
 VA-API

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

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index ab58f4a74dc..9a6dd29729d 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -522,7 +522,7 @@ <h1 class="my-4">Configuration</h1>
         <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="nvenc">nVidia NVENC</option>
+          <option value="nvenc">NVIDIA NVENC</option>
           <option value="amdvce">AMD AMF/VCE</option>
           <option value="vaapi">VA-API</option>
           <option value="software">Software</option>
@@ -808,7 +808,7 @@ <h1 class="my-4">Configuration</h1>
           },
           {
             id: "nv",
-            name: "NVENC Encoder",
+            name: "NVIDIA NVENC Encoder",
           },
           {
             id: "amd",
@@ -816,11 +816,11 @@ <h1 class="my-4">Configuration</h1>
           },
           {
             id: "va-api",
-            name: "VA-API encoder",
+            name: "VA-API Encoder",
           },
           {
             id: "vt",
-            name: "VideoToolbox encoder",
+            name: "VideoToolbox Encoder",
           },
           {
             id: "sw",

From 723207371a4f83735e5c6b15d66decb047997e4c Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 4 Jan 2023 17:06:47 -0600
Subject: [PATCH 7/8] Reorder conditions to be alphabetical

---
 src_assets/common/assets/web/config.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 9a6dd29729d..1b264e53732 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -849,7 +849,7 @@ <h1 class="my-4">Configuration</h1>
           }
           if (this.platform == "macos") {
             this.tabs = this.tabs.filter((el) => {
-              return el.id !== "amd" && el.id !== "va-api" && el.id !== "nv";
+              return el.id !== "amd" && el.id !== "nv" && el.id !== "va-api";
             });
           }
 

From a9128027e7be4e9cf132da09722c61157b195cf1 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 4 Jan 2023 17:13:39 -0600
Subject: [PATCH 8/8] Hide unsupported encoder options in force encoder list

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

diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 1b264e53732..bb961c624d8 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -522,9 +522,10 @@ <h1 class="my-4">Configuration</h1>
         <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="nvenc">NVIDIA NVENC</option>
-          <option value="amdvce">AMD AMF/VCE</option>
-          <option value="vaapi">VA-API</option>
+          <option value="nvenc" v-if="platform === 'windows' || platform === 'linux'">NVIDIA NVENC</option>
+          <option value="amdvce" v-if="platform === 'windows'">AMD AMF/VCE</option>
+          <option value="vaapi" v-if="platform === 'linux'">VA-API</option>
+          <option value="videotoolbox" v-if="platform === 'macos'">VideoToolbox</option>
           <option value="software">Software</option>
         </select>
         <div class="form-text">