izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor UI fixes (#696)

Browse Source
This commit is contained in:
Cameron Gutman
2023-01-04 17:44:23 -06:00
committed by GitHub
parent 1a929cc37b
commit 08cb5fc2f2
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/about/advanced_usage.rst
View File

@@ -667,7 +667,7 @@ qp
^^ ^^
**Description** **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. .. Warning:: Higher value means more compression, but less quality.
@@ -683,7 +683,7 @@ min_threads
^^^^^^^^^^^ ^^^^^^^^^^^
**Description** **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 .. 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 the use of more CPU cores for encoding. The ideal value is the lowest value that can reliably encode at your

40
src_assets/common/assets/web/config.html
View File

@@ -461,7 +461,7 @@
</div> </div>
<!-- Quantization Parameter --> <!-- Quantization Parameter -->
<div class="mb-3"> <div class="mb-3">
<label for="qp" class="form-label">Quantitization Parameter</label> <label for="qp" class="form-label">Quantization Parameter</label>
<input <input
type="number" type="number"
class="form-control" class="form-control"
@@ -470,7 +470,7 @@
v-model="config.qp" v-model="config.qp"
/> />
<div class="form-text"> <div class="form-text">
Quantitization Parameter<br /> Quantization Parameter<br />
Some devices may not support Constant Bit Rate.<br /> Some devices may not support Constant Bit Rate.<br />
For those devices, QP is used instead.<br /> For those devices, QP is used instead.<br />
Higher value means more compression, but less quality<br /> Higher value means more compression, but less quality<br />
@@ -479,7 +479,7 @@
<!-- Min Threads --> <!-- Min Threads -->
<div class="mb-3"> <div class="mb-3">
<label for="min_threads" class="form-label" <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 <input
type="number" type="number"
@@ -490,7 +490,6 @@
v-model="config.min_threads" v-model="config.min_threads"
/> />
<div class="form-text"> <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 /> 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 /> 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. value that can reliably encode at your desired streaming settings on your hardware.
@@ -523,9 +522,10 @@
<label for="encoder" class="form-label">Force a Specific Encoder</label> <label for="encoder" class="form-label">Force a Specific Encoder</label>
<select id="encoder" class="form-select" v-model="config.encoder"> <select id="encoder" class="form-select" v-model="config.encoder">
<option value>Autodetect</option> <option value>Autodetect</option>
<option value="nvenc">nVidia NVENC</option> <option value="nvenc" v-if="platform === 'windows' || platform === 'linux'">NVIDIA NVENC</option>
<option value="amdvce">AMD AMF/VCE</option> <option value="amdvce" v-if="platform === 'windows'">AMD AMF/VCE</option>
<option value="vaapi">VA-API</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> <option value="software">Software</option>
</select> </select>
<div class="form-text"> <div class="form-text">
@@ -727,6 +727,7 @@
</select> </select>
</div> </div>
</div> </div>
<!--VA-API Encoder Settings-->
<div v-if="currentTab === 'va-api'" class="config-page"> <div v-if="currentTab === 'va-api'" class="config-page">
<input <input
class="form-control" class="form-control"
@@ -806,25 +807,25 @@
id: "advanced", id: "advanced",
name: "Advanced", name: "Advanced",
}, },
{
id: "sw",
name: "Software Encoder",
},
{ {
id: "nv", id: "nv",
name: "NVENC Encoder", name: "NVIDIA NVENC Encoder",
}, },
{ {
id: "amd", id: "amd",
name: "AMF Encoder", name: "AMD AMF Encoder",
}, },
{ {
id: "va-api", id: "va-api",
name: "VA-API encoder", name: "VA-API Encoder",
}, },
{ {
id: "vt", id: "vt",
name: "VideoToolbox encoder", name: "VideoToolbox Encoder",
},
{
id: "sw",
name: "Software Encoder",
}, },
], ],
}; };
@@ -839,12 +840,17 @@
var app = document.getElementById("app"); var app = document.getElementById("app");
if (this.platform == "windows") { if (this.platform == "windows") {
this.tabs = this.tabs.filter((el) => { this.tabs = this.tabs.filter((el) => {
return el.id !== "va-api"; return el.id !== "va-api" && el.id !== "vt";
}); });
} }
if (this.platform == "linux") { if (this.platform == "linux") {
this.tabs = this.tabs.filter((el) => { 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 !== "nv" && el.id !== "va-api";
}); });
} }