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 #1842 from nyanmisaka/muxer-ui

Browse source 
Expose max_muxing_queue_size to user
This commit is contained in:
dkanada 2020-09-12 05:41:25 +09:00 • committed by GitHub
commit 6cf7cfac8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -182,6 +182,10 @@
<input is="emby-input" type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" label="${LabelDownMixAudioScale}" /> <input is="emby-input" type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" label="${LabelDownMixAudioScale}" />
<div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div> <div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div>
</div> </div>
<div class="inputContainer">
<input is="emby-input" type="number" id="txtMaxMuxingQueueSize" pattern="[0-9]*" required="required" min="128" max="2147483647" step="1" label="${LabelMaxMuxingQueueSize}" />
<div class="fieldDescription">${LabelMaxMuxingQueueSizeHelp}</div>
</div>
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}"> <select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}">

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

@ -16,6 +16,7 @@ import libraryMenu from 'libraryMenu';
$('#selectVideoDecoder', page).val(config.HardwareAccelerationType); $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
$('#selectThreadCount', page).val(config.EncodingThreadCount); $('#selectThreadCount', page).val(config.EncodingThreadCount);
$('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost); $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
page.querySelector('#txtMaxMuxingQueueSize').value = config.MaxMuxingQueueSize || '';
page.querySelector('.txtEncoderPath').value = config.EncoderAppPathDisplay || ''; page.querySelector('.txtEncoderPath').value = config.EncoderAppPathDisplay || '';
$('#txtTranscodingTempPath', page).val(systemInfo.TranscodingTempPath || ''); $('#txtTranscodingTempPath', page).val(systemInfo.TranscodingTempPath || '');
$('#txtVaapiDevice', page).val(config.VaapiDevice || ''); $('#txtVaapiDevice', page).val(config.VaapiDevice || '');
@ -70,6 +71,7 @@ import libraryMenu from 'libraryMenu';
loading.show(); loading.show();
ApiClient.getNamedConfiguration('encoding').then(function (config) { ApiClient.getNamedConfiguration('encoding').then(function (config) {
config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val(); config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
config.MaxMuxingQueueSize = form.querySelector('#txtMaxMuxingQueueSize').value;
config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val(); config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
config.EncodingThreadCount = $('#selectThreadCount', form).val(); config.EncodingThreadCount = $('#selectThreadCount', form).val();
config.HardwareAccelerationType = $('#selectVideoDecoder', form).val(); config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();

BIN
src/strings/.en-us.json.swp Normal file
View file

Binary file not shown.

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

@ -1399,5 +1399,7 @@
"ClearQueue": "Clear queue", "ClearQueue": "Clear queue",
"LabelSubtitleVerticalPosition": "Vertical position:", "LabelSubtitleVerticalPosition": "Vertical position:",
"SubtitleVerticalPositionHelp": "Line number where text appears. Positive numbers indicate top down. Negative numbers indicate bottom up.", "SubtitleVerticalPositionHelp": "Line number where text appears. Positive numbers indicate top down. Negative numbers indicate bottom up.",
"Preview": "Preview" "Preview": "Preview",
"LabelMaxMuxingQueueSize": "Max muxing queue size:",
"LabelMaxMuxingQueueSizeHelp": "Maximum number of packets that can be buffered while waiting for all streams to initialize. Try to increase it if you still encounter \"Too many packets buffered for output stream\" error in ffmpeg logs. The recommended value is 2048."
} }

2
src/strings/zh-cn.json
View file

@ -1377,6 +1377,8 @@
"NextTrack": "下一曲", "NextTrack": "下一曲",
"LabelUnstable": "不稳定", "LabelUnstable": "不稳定",
"PlaybackRate": "播放速率", "PlaybackRate": "播放速率",
"LabelMaxMuxingQueueSize": "最大混合器队列大小：",
"LabelMaxMuxingQueueSizeHelp": "等待所有流初始化时可缓冲的最大数据包数。如果在 ffmpeg 日志中仍然遇到 \"Too many packets buffered for output stream\" 错误，请尝试增加该值。建议值为 2048。",
"Profile": "简介", "Profile": "简介",
"LabelIconMaxResHelp": "通过 upnp:icon 属性公开的图标的最大分辨率。", "LabelIconMaxResHelp": "通过 upnp:icon 属性公开的图标的最大分辨率。",
"LabelAlbumArtMaxResHelp": "通过 upnp:albumArtURI 属性公开的专辑封面的最大分辨率。", "LabelAlbumArtMaxResHelp": "通过 upnp:albumArtURI 属性公开的专辑封面的最大分辨率。",