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 #6043 from gnattu/fix-enum-transcode

Browse source 
Change encoding preset and play stats for server change
This commit is contained in:
Bill Thornton 2024-09-16 00:24:16 -04:00 • committed by GitHub
commit 818f90d05c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/playerstats/playerstats.js
View file

@ -172,12 +172,17 @@ function getTranscodingStats(session, player, displayPlayMethod) {
value: session.TranscodingInfo.TranscodeReasons.map(translateReason).join('<br/>') value: session.TranscodingInfo.TranscodeReasons.map(translateReason).join('<br/>')
}); });
} }
if (session.TranscodingInfo.HardwareAccelerationType) { // Hide this for now because it is not useful in its current state.
sessionStats.push({ // This only reflects the configuration in the dashboard, but the actual
label: globalize.translate('LabelHardwareEncoding'), // decoder/encoder selection is more complex. As a result, the hardware
value: session.TranscodingInfo.HardwareAccelerationType // encoder may not be used even if hardware acceleration is configured,
}); // making the display of hardware acceleration misleading.
} // if (session.TranscodingInfo.HardwareAccelerationType) {
// sessionStats.push({
// label: globalize.translate('LabelHardwareEncoding'),
// value: session.TranscodingInfo.HardwareAccelerationType
// });
// }
} }
return sessionStats; return sessionStats;

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

@ -11,7 +11,7 @@
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectVideoDecoder" label="${LabelHardwareAccelerationType}"> <select is="emby-select" id="selectVideoDecoder" label="${LabelHardwareAccelerationType}">
<option value="">${None}</option> <option value="none">${None}</option>
<option value="amf">AMD AMF</option> <option value="amf">AMD AMF</option>
<option value="nvenc">Nvidia NVENC</option> <option value="nvenc">Nvidia NVENC</option>
<option value="qsv">Intel QuickSync (QSV)</option> <option value="qsv">Intel QuickSync (QSV)</option>
@ -312,7 +312,7 @@
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}"> <select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}">
<option value="">${Auto}</option> <option value="auto">${Auto}</option>
<option value="veryslow">veryslow</option> <option value="veryslow">veryslow</option>
<option value="slower">slower</option> <option value="slower">slower</option>
<option value="slow">slow</option> <option value="slow">slow</option>