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 branch 'master' into trickplay-new

Browse source
This commit is contained in:
Nick 2024-03-17 19:33:16 -07:00 • committed by GitHub
commit fc664090cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 326 additions and 153 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>
</label>
</div>
<div class="checkboxList">
<div class="checkboxList allowAv1EncodingOption">
<label>
<input type="checkbox" is="emby-checkbox" id="chkAllowAv1Encoding" />
<span>${AllowAv1Encoding}</span>
@ -161,6 +161,16 @@
</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="checkboxListContainer checkboxContainer-withDescription">
<label>

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

@ -33,6 +33,7 @@ function loadPage(page, config, systemInfo) {
$('#txtVaapiDevice', page).val(config.VaapiDevice || '');
page.querySelector('#chkTonemapping').checked = config.EnableTonemapping;
page.querySelector('#chkVppTonemapping').checked = config.EnableVppTonemapping;
page.querySelector('#chkVideoToolboxTonemapping').checked = config.EnableVideoToolboxTonemapping;
page.querySelector('#selectTonemappingAlgorithm').value = config.TonemappingAlgorithm;
page.querySelector('#selectTonemappingMode').value = config.TonemappingMode;
page.querySelector('#selectTonemappingRange').value = config.TonemappingRange;
@ -94,6 +95,7 @@ function onSubmit() {
config.VaapiDevice = $('#txtVaapiDevice', form).val();
config.EnableTonemapping = form.querySelector('#chkTonemapping').checked;
config.EnableVppTonemapping = form.querySelector('#chkVppTonemapping').checked;
config.EnableVideoToolboxTonemapping = form.querySelector('#chkVideoToolboxTonemapping').checked;
config.TonemappingAlgorithm = form.querySelector('#selectTonemappingAlgorithm').value;
config.TonemappingMode = form.querySelector('#selectTonemappingMode').value;
config.TonemappingRange = form.querySelector('#selectTonemappingRange').value;
@ -211,7 +213,7 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
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');
} else {
page.querySelector('.tonemappingOptions').classList.add('hide');
@ -223,6 +225,14 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
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')) {
page.querySelector('.vppTonemappingOptions').classList.remove('hide');
} else {