Skip to content

Minor UI fixes #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 8 commits into from
Jan 4, 2023
Merged

Minor UI fixes #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
09ef8a1
Clarify that the min_threads value only affects software encoding
cgutman Jan 4, 2023
2113a79
Add "AMD" to the AMF encoder title
cgutman Jan 4, 2023
e13389f
Hide tabs for encoders that are not available
cgutman Jan 4, 2023
98cc2e8
Fix QP misspelling
cgutman Jan 4, 2023
2436bd2
Sort encoder tabs in priority order
cgutman Jan 4, 2023
1a7cdb7
Standardize NVENC name and and capitalization for VT and VA-API
cgutman Jan 4, 2023
7232073
Reorder conditions to be alphabetical
cgutman Jan 4, 2023
a912802
Hide unsupported encoder options in force encoder list
cgutman Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/source/about/advanced_usage.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand Down
40 changes: 23 additions & 17 deletions src_assets/common/assets/web/config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 />
Expand All @@ -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"
Expand All @@ -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.
Expand Down Expand Up @@ -523,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">
Expand Down Expand Up @@ -727,6 +727,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"
Expand Down Expand Up @@ -806,25 +807,25 @@ <h1 class="my-4">Configuration</h1>
id: "advanced",
name: "Advanced",
},
{
id: "sw",
name: "Software Encoder",
},
{
id: "nv",
name: "NVENC Encoder",
name: "NVIDIA NVENC Encoder",
},
{
id: "amd",
name: "AMF Encoder",
name: "AMD AMF Encoder",
},
{
id: "va-api",
name: "VA-API encoder",
name: "VA-API Encoder",
},
{
id: "vt",
name: "VideoToolbox encoder",
name: "VideoToolbox Encoder",
},
{
id: "sw",
name: "Software Encoder",
},
],
};
Expand All @@ -839,12 +840,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 !== "nv" && el.id !== "va-api";
});
}

Expand Down