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 #5240 from gnattu/apple-hwa

Browse source
This commit is contained in:
Bill Thornton 2024-03-15 00:25:10 -04:00 • committed by GitHub
commit b54d791e95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,7 @@
<span>${AllowHevcEncoding}</span> <span>${AllowHevcEncoding}</span>
</label> </label>
</div> </div>
<div class="checkboxList"> <div class="checkboxList allowAv1EncodingOption">
<label> <label>
<input type="checkbox" is="emby-checkbox" id="chkAllowAv1Encoding" /> <input type="checkbox" is="emby-checkbox" id="chkAllowAv1Encoding" />
<span>${AllowAv1Encoding}</span> <span>${AllowAv1Encoding}</span>
@ -155,6 +155,16 @@
</div> </div>
</div> </div>
<div class="videoToolboxTonemappingOptions hide">
<div class="checkboxListContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" id="chkVideoToolboxTonemapping" />
<span>${EnableVideoToolboxTonemapping}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${AllowVideoToolboxTonemappingHelp}</div>
</div>
</div>
<div class="tonemappingOptions hide"> <div class="tonemappingOptions hide">
<div class="checkboxListContainer checkboxContainer-withDescription"> <div class="checkboxListContainer checkboxContainer-withDescription">
<label> <label>

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

@ -32,6 +32,7 @@ function loadPage(page, config, systemInfo) {
$('#txtVaapiDevice', page).val(config.VaapiDevice || ''); $('#txtVaapiDevice', page).val(config.VaapiDevice || '');
page.querySelector('#chkTonemapping').checked = config.EnableTonemapping; page.querySelector('#chkTonemapping').checked = config.EnableTonemapping;
page.querySelector('#chkVppTonemapping').checked = config.EnableVppTonemapping; page.querySelector('#chkVppTonemapping').checked = config.EnableVppTonemapping;
page.querySelector('#chkVideoToolboxTonemapping').checked = config.EnableVideoToolboxTonemapping;
page.querySelector('#selectTonemappingAlgorithm').value = config.TonemappingAlgorithm; page.querySelector('#selectTonemappingAlgorithm').value = config.TonemappingAlgorithm;
page.querySelector('#selectTonemappingMode').value = config.TonemappingMode; page.querySelector('#selectTonemappingMode').value = config.TonemappingMode;
page.querySelector('#selectTonemappingRange').value = config.TonemappingRange; page.querySelector('#selectTonemappingRange').value = config.TonemappingRange;
@ -93,6 +94,7 @@ function onSubmit() {
config.VaapiDevice = $('#txtVaapiDevice', form).val(); config.VaapiDevice = $('#txtVaapiDevice', form).val();
config.EnableTonemapping = form.querySelector('#chkTonemapping').checked; config.EnableTonemapping = form.querySelector('#chkTonemapping').checked;
config.EnableVppTonemapping = form.querySelector('#chkVppTonemapping').checked; config.EnableVppTonemapping = form.querySelector('#chkVppTonemapping').checked;
config.EnableVideoToolboxTonemapping = form.querySelector('#chkVideoToolboxTonemapping').checked;
config.TonemappingAlgorithm = form.querySelector('#selectTonemappingAlgorithm').value; config.TonemappingAlgorithm = form.querySelector('#selectTonemappingAlgorithm').value;
config.TonemappingMode = form.querySelector('#selectTonemappingMode').value; config.TonemappingMode = form.querySelector('#selectTonemappingMode').value;
config.TonemappingRange = form.querySelector('#selectTonemappingRange').value; config.TonemappingRange = form.querySelector('#selectTonemappingRange').value;
@ -206,7 +208,7 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
page.querySelector('.fld10bitHevcVp9HwDecoding').classList.add('hide'); page.querySelector('.fld10bitHevcVp9HwDecoding').classList.add('hide');
} }
if (this.value == 'amf' || this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'rkmpp') { if (this.value == 'amf' || this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'rkmpp' || this.value == 'videotoolbox') {
page.querySelector('.tonemappingOptions').classList.remove('hide'); page.querySelector('.tonemappingOptions').classList.remove('hide');
} else { } else {
page.querySelector('.tonemappingOptions').classList.add('hide'); page.querySelector('.tonemappingOptions').classList.add('hide');
@ -218,6 +220,14 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
page.querySelector('.fldIntelLp').classList.add('hide'); page.querySelector('.fldIntelLp').classList.add('hide');
} }
if (this.value === 'videotoolbox') {
page.querySelector('.videoToolboxTonemappingOptions').classList.remove('hide');
page.querySelector('.allowAv1EncodingOption').classList.add('hide');
} else {
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')) {
page.querySelector('.vppTonemappingOptions').classList.remove('hide'); page.querySelector('.vppTonemappingOptions').classList.remove('hide');
} else { } else {

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

@ -1547,6 +1547,8 @@
"EnableEnhancedNvdecDecoder": "Enable enhanced NVDEC decoder", "EnableEnhancedNvdecDecoder": "Enable enhanced NVDEC decoder",
"EnableVppTonemapping": "Enable VPP Tone mapping", "EnableVppTonemapping": "Enable VPP Tone mapping",
"AllowVppTonemappingHelp": "Full Intel driver based tone-mapping. Currently works only on certain hardware with HDR10 videos. This has a higher priority compared to another OpenCL implementation.", "AllowVppTonemappingHelp": "Full Intel driver based tone-mapping. Currently works only on certain hardware with HDR10 videos. This has a higher priority compared to another OpenCL implementation.",
"EnableVideoToolboxTonemapping": "Enable VideoToolbox Tone mapping",
"AllowVideoToolboxTonemappingHelp": "Hardware-accelerated tone-mapping provided by VideoToolbox. It works with most HDR formats, including HDR10, HDR10+, and HLG, but does not work with Dolby Vision Profile 5. This has a higher priority compared to another OpenCL implementation.",
"Controls": "Controls", "Controls": "Controls",
"LabelEnableGamepad": "Enable Gamepad", "LabelEnableGamepad": "Enable Gamepad",
"EnableGamepadHelp": "Listen for input from any connected controllers. (Requires: 'TV' Display Mode)", "EnableGamepadHelp": "Listen for input from any connected controllers. (Requires: 'TV' Display Mode)",