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 #6004 from evanjarrett/qsv-renderdevice

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

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

@ -30,6 +30,11 @@
<div class="fieldDescription">${LabelVaapiDeviceHelp}</div> <div class="fieldDescription">${LabelVaapiDeviceHelp}</div>
</div> </div>
<div class="inputContainer hide fldQsvDevice">
<input is="emby-input" type="text" id="txtQsvDevice" label="${LabelQsvDevice}" />
<div class="fieldDescription">${LabelQsvDeviceHelp}</div>
</div>
<div class="hardwareAccelerationOptions hide"> <div class="hardwareAccelerationOptions hide">
<div class="checkboxListContainer decodingCodecsList"> <div class="checkboxListContainer decodingCodecsList">
<h3 class="checkboxListLabel">${LabelEnableHardwareDecodingFor}</h3> <h3 class="checkboxListLabel">${LabelEnableHardwareDecodingFor}</h3>

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

@ -31,6 +31,7 @@ function loadPage(page, config, systemInfo) {
page.querySelector('#txtFallbackFontPath').value = config.FallbackFontPath || ''; page.querySelector('#txtFallbackFontPath').value = config.FallbackFontPath || '';
page.querySelector('#chkEnableFallbackFont').checked = config.EnableFallbackFont; page.querySelector('#chkEnableFallbackFont').checked = config.EnableFallbackFont;
$('#txtVaapiDevice', page).val(config.VaapiDevice || ''); $('#txtVaapiDevice', page).val(config.VaapiDevice || '');
page.querySelector('#txtQsvDevice').value = config.QsvDevice || '';
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('#chkVideoToolboxTonemapping').checked = config.EnableVideoToolboxTonemapping;
@ -93,6 +94,7 @@ function onSubmit() {
config.EncodingThreadCount = $('#selectThreadCount', form).val(); config.EncodingThreadCount = $('#selectThreadCount', form).val();
config.HardwareAccelerationType = $('#selectVideoDecoder', form).val(); config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
config.VaapiDevice = $('#txtVaapiDevice', form).val(); config.VaapiDevice = $('#txtVaapiDevice', form).val();
config.QsvDevice = form.querySelector('#txtQsvDevice').value;
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.EnableVideoToolboxTonemapping = form.querySelector('#chkVideoToolboxTonemapping').checked;
@ -235,8 +237,12 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
if (this.value == 'qsv') { if (this.value == 'qsv') {
page.querySelector('.fldSysNativeHwDecoder').classList.remove('hide'); page.querySelector('.fldSysNativeHwDecoder').classList.remove('hide');
page.querySelector('.fldQsvDevice').classList.remove('hide');
page.querySelector('#txtQsvDevice').setAttribute('required', 'required');
} else { } else {
page.querySelector('.fldSysNativeHwDecoder').classList.add('hide'); page.querySelector('.fldSysNativeHwDecoder').classList.add('hide');
page.querySelector('.fldQsvDevice').classList.add('hide');
page.querySelector('#txtQsvDevice').removeAttribute('required');
} }
if (this.value == 'nvenc') { if (this.value == 'nvenc') {

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

@ -840,6 +840,8 @@
"LabelPublicHttpsPortHelp": "The public port number that should be mapped to the local HTTPS port.", "LabelPublicHttpsPortHelp": "The public port number that should be mapped to the local HTTPS port.",
"LabelPublishedServerUri": "Published Server URIs", "LabelPublishedServerUri": "Published Server URIs",
"LabelPublishedServerUriHelp": "Override the URI used by Jellyfin, based on the interface, or client IP address. For example: internal=http://jellyfin.example.com, external=https://jellyfin.example.com, or all=https://jellyfin.example.com", "LabelPublishedServerUriHelp": "Override the URI used by Jellyfin, based on the interface, or client IP address. For example: internal=http://jellyfin.example.com, external=https://jellyfin.example.com, or all=https://jellyfin.example.com",
"LabelQsvDevice": "QSV Device",
"LabelQsvDeviceHelp": "Specify the device for Intel QSV on a multi-GPU system. On Linux, this is the render node, e.g., /dev/dri/renderD128. On Windows, this is the device index starting from 0. Leave blank unless you know what you are doing.",
"LabelQuickConnectCode": "Quick Connect code", "LabelQuickConnectCode": "Quick Connect code",
"LabelReasonForTranscoding": "Reason for transcoding", "LabelReasonForTranscoding": "Reason for transcoding",
"LabelRecord": "Record", "LabelRecord": "Record",