From 9f92c1d158b1c01b279eb9b46f70c06d93986f22 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Tue, 25 Aug 2020 01:57:21 +0800
Subject: [PATCH] expose max_muxing_queue_size to user

---
 src/controllers/dashboard/encodingsettings.html |   4 ++++
 src/controllers/dashboard/encodingsettings.js   |   2 ++
 src/strings/.en-us.json.swp                     | Bin 0 -> 16384 bytes
 src/strings/en-us.json                          |   4 +++-
 src/strings/zh-cn.json                          |   4 +++-
 5 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/strings/.en-us.json.swp

diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 402532e600..4032939a89 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -129,6 +129,10 @@
                     <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>
+                <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">
                     <select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}">
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index dfad07618c..3398dfcb7e 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -16,6 +16,7 @@ import libraryMenu from 'libraryMenu';
         $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
         $('#selectThreadCount', page).val(config.EncodingThreadCount);
         $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
+        page.querySelector('#txtMaxMuxingQueueSize').value = config.MaxMuxingQueueSize || '';
         page.querySelector('.txtEncoderPath').value = config.EncoderAppPathDisplay || '';
         $('#txtTranscodingTempPath', page).val(systemInfo.TranscodingTempPath || '');
         $('#txtVaapiDevice', page).val(config.VaapiDevice || '');
@@ -60,6 +61,7 @@ import libraryMenu from 'libraryMenu';
             loading.show();
             ApiClient.getNamedConfiguration('encoding').then(function (config) {
                 config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
+                config.MaxMuxingQueueSize = form.querySelector('#txtMaxMuxingQueueSize').value;
                 config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
                 config.EncodingThreadCount = $('#selectThreadCount', form).val();
                 config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
diff --git a/src/strings/.en-us.json.swp b/src/strings/.en-us.json.swp
new file mode 100644
index 0000000000000000000000000000000000000000..bbb5d9ab1641a6c2570646b97834b16268a5b238
GIT binary patch
literal 16384
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
Fe*^uSL*f7c

literal 0
HcmV?d00001

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index f87c1a326e..d66d298978 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1442,5 +1442,7 @@
     "ClearQueue": "Clear queue",
     "LabelSubtitleVerticalPosition": "Vertical position:",
     "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."
 }
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index a44b9ab992..d72eb3774f 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1442,5 +1442,7 @@
     "MessagePluginInstallError": "安装插件时出现错误。",
     "NextTrack": "下一曲",
     "LabelUnstable": "不稳定",
-    "PlaybackRate": "播放速率"
+    "PlaybackRate": "播放速率",
+    "LabelMaxMuxingQueueSize": "最大混合器队列大小：",
+    "LabelMaxMuxingQueueSizeHelp": "等待所有流初始化时可缓冲的最大数据包数。如果在 ffmpeg 日志中仍然遇到 \"Too many packets buffered for output stream\" 错误，请尝试增加该值。建议值为 2048。"
 }