mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #5330 from gnattu/clarify-encoding-format-options

Browse source 
Add clear help text for encoding format options
This commit is contained in:
Bill Thornton 2024-03-29 03:54:24 -04:00 • committed by GitHub
commit 3fb99fe22d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/dashboard/encodingsettings.html
View file

@ -123,13 +123,15 @@
</div> </div>
<div class="checkboxListContainer"> <div class="checkboxListContainer">
<h3 class="checkboxListLabel">${LabelEncodingFormatOptions}</h3>
<div class="fieldDescription">${EncodingFormatHelp}</div>
<div class="checkboxList"> <div class="checkboxList">
<label> <label>
<input type="checkbox" is="emby-checkbox" id="chkAllowHevcEncoding" /> <input type="checkbox" is="emby-checkbox" id="chkAllowHevcEncoding" />
<span>${AllowHevcEncoding}</span> <span>${AllowHevcEncoding}</span>
</label> </label>
</div> </div>
<div class="checkboxList allowAv1EncodingOption"> <div class="checkboxList">
<label> <label>
<input type="checkbox" is="emby-checkbox" id="chkAllowAv1Encoding" /> <input type="checkbox" is="emby-checkbox" id="chkAllowAv1Encoding" />
<span>${AllowAv1Encoding}</span> <span>${AllowAv1Encoding}</span>

2
src/controllers/dashboard/encodingsettings.js
View file

@ -227,10 +227,8 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
if (this.value === 'videotoolbox') { if (this.value === 'videotoolbox') {
page.querySelector('.videoToolboxTonemappingOptions').classList.remove('hide'); page.querySelector('.videoToolboxTonemappingOptions').classList.remove('hide');
page.querySelector('.allowAv1EncodingOption').classList.add('hide');
} else { } else {
page.querySelector('.videoToolboxTonemappingOptions').classList.add('hide'); page.querySelector('.videoToolboxTonemappingOptions').classList.add('hide');
page.querySelector('.allowAv1EncodingOption').classList.remove('hide');
} }
if (systemInfo.OperatingSystem.toLowerCase() === 'linux' && (this.value == 'qsv' || this.value == 'vaapi')) { if (systemInfo.OperatingSystem.toLowerCase() === 'linux' && (this.value == 'qsv' || this.value == 'vaapi')) {

2
src/strings/en-us.json
View file

@ -1603,6 +1603,8 @@
"EnableIntelLowPowerHevcHwEncoder": "Enable Intel Low-Power HEVC hardware encoder", "EnableIntelLowPowerHevcHwEncoder": "Enable Intel Low-Power HEVC hardware encoder",
"IntelLowPowerEncHelp": "Low-Power Encoding can keep unnecessary CPU-GPU sync. On Linux they must be disabled if the i915 HuC firmware is not configured.", "IntelLowPowerEncHelp": "Low-Power Encoding can keep unnecessary CPU-GPU sync. On Linux they must be disabled if the i915 HuC firmware is not configured.",
"LabelHardwareEncodingOptions": "Hardware encoding options", "LabelHardwareEncodingOptions": "Hardware encoding options",
"LabelEncodingFormatOptions": "Encoding format options",
"EncodingFormatHelp": "Select the video encoding that Jellyfin should transcode to. Jellyfin will use software encoding when hardware acceleration for the selected format is not available. H264 encoding will always be enabled.",
"AudioIsExternal": "The audio stream is external", "AudioIsExternal": "The audio stream is external",
"VideoBitrateNotSupported": "The video's bitrate is not supported", "VideoBitrateNotSupported": "The video's bitrate is not supported",
"UnknownVideoStreamInfo": "The video stream info is unknown", "UnknownVideoStreamInfo": "The video stream info is unknown",