From ba2c777772533c3095cf19f16776100bf60ea1a2 Mon Sep 17 00:00:00 2001 From: PloughPuff Date: Fri, 8 Feb 2019 13:16:30 +0000 Subject: [PATCH 1/6] Always show FFmpeg path in Transcoding page Removed the 'hide' and 'required' settings from the html to always show the FFmpeg path to user and also allow user to remove a custom path and return to using whatever is available from system $PATH. --- src/encodingsettings.html | 4 ++-- src/scripts/encodingsettings.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/encodingsettings.html b/src/encodingsettings.html index cc4b2360ed..ae0cd83cf6 100644 --- a/src/encodingsettings.html +++ b/src/encodingsettings.html @@ -91,10 +91,10 @@
${LabelTranscodingThreadCountHelp}
-
+
- +
diff --git a/src/scripts/encodingsettings.js b/src/scripts/encodingsettings.js index 7a2461a6bb..392ec22250 100644 --- a/src/scripts/encodingsettings.js +++ b/src/scripts/encodingsettings.js @@ -90,8 +90,8 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize var page = this; ApiClient.getNamedConfiguration("encoding").then(function(config) { ApiClient.getSystemInfo().then(function(systemInfo) { - "External" == systemInfo.EncoderLocationType ? (page.querySelector(".fldEncoderPath").classList.add("hide"), page.querySelector(".txtEncoderPath").removeAttribute("required")) : (page.querySelector(".fldEncoderPath").classList.remove("hide"), page.querySelector(".txtEncoderPath").setAttribute("required", "required")), loadPage(page, config, systemInfo) + loadPage(page, config, systemInfo) }) }) }) -}); \ No newline at end of file +}); From 037059f59d63494b2c5fd742900c5dce0479954c Mon Sep 17 00:00:00 2001 From: PloughPuff Date: Thu, 28 Feb 2019 22:10:49 +0000 Subject: [PATCH 2/6] Use EncoderAppPathDisplay to populate encoder path field --- src/scripts/encodingsettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/encodingsettings.js b/src/scripts/encodingsettings.js index 392ec22250..88e08f87d3 100644 --- a/src/scripts/encodingsettings.js +++ b/src/scripts/encodingsettings.js @@ -4,7 +4,7 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize function loadPage(page, config, systemInfo) { Array.prototype.forEach.call(page.querySelectorAll(".chkDecodeCodec"), function(c) { c.checked = -1 !== (config.HardwareDecodingCodecs || []).indexOf(c.getAttribute("data-codec")) - }), page.querySelector("#chkHardwareEncoding").checked = config.EnableHardwareEncoding, $("#selectVideoDecoder", page).val(config.HardwareAccelerationType), $("#selectThreadCount", page).val(config.EncodingThreadCount), $("#txtDownMixAudioBoost", page).val(config.DownMixAudioBoost), page.querySelector(".txtEncoderPath").value = config.EncoderAppPath || "", $("#txtTranscodingTempPath", page).val(config.TranscodingTempPath || ""), $("#txtVaapiDevice", page).val(config.VaapiDevice || ""), page.querySelector("#selectH264Preset").value = config.H264Preset || "", page.querySelector("#txtH264Crf").value = config.H264Crf || "", page.querySelector("#chkEnableSubtitleExtraction").checked = config.EnableSubtitleExtraction || !1, page.querySelector("#selectVideoDecoder").dispatchEvent(new CustomEvent("change", { + }), page.querySelector("#chkHardwareEncoding").checked = config.EnableHardwareEncoding, $("#selectVideoDecoder", page).val(config.HardwareAccelerationType), $("#selectThreadCount", page).val(config.EncodingThreadCount), $("#txtDownMixAudioBoost", page).val(config.DownMixAudioBoost), page.querySelector(".txtEncoderPath").value = config.EncoderAppPathDisplay || "", $("#txtTranscodingTempPath", page).val(config.TranscodingTempPath || ""), $("#txtVaapiDevice", page).val(config.VaapiDevice || ""), page.querySelector("#selectH264Preset").value = config.H264Preset || "", page.querySelector("#txtH264Crf").value = config.H264Crf || "", page.querySelector("#chkEnableSubtitleExtraction").checked = config.EnableSubtitleExtraction || !1, page.querySelector("#selectVideoDecoder").dispatchEvent(new CustomEvent("change", { bubbles: !0 })), loading.hide() } From 62bb9f8721965aa401d62fb3e9bfc10c9e675003 Mon Sep 17 00:00:00 2001 From: Vasily Date: Thu, 7 Mar 2019 21:19:21 +0000 Subject: [PATCH 3/6] Update src/scripts/encodingsettings.js Co-Authored-By: ploughpuff <33969763+ploughpuff@users.noreply.github.com> --- src/scripts/encodingsettings.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/scripts/encodingsettings.js b/src/scripts/encodingsettings.js index 88e08f87d3..20f42e4f26 100644 --- a/src/scripts/encodingsettings.js +++ b/src/scripts/encodingsettings.js @@ -4,7 +4,18 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize function loadPage(page, config, systemInfo) { Array.prototype.forEach.call(page.querySelectorAll(".chkDecodeCodec"), function(c) { c.checked = -1 !== (config.HardwareDecodingCodecs || []).indexOf(c.getAttribute("data-codec")) - }), page.querySelector("#chkHardwareEncoding").checked = config.EnableHardwareEncoding, $("#selectVideoDecoder", page).val(config.HardwareAccelerationType), $("#selectThreadCount", page).val(config.EncodingThreadCount), $("#txtDownMixAudioBoost", page).val(config.DownMixAudioBoost), page.querySelector(".txtEncoderPath").value = config.EncoderAppPathDisplay || "", $("#txtTranscodingTempPath", page).val(config.TranscodingTempPath || ""), $("#txtVaapiDevice", page).val(config.VaapiDevice || ""), page.querySelector("#selectH264Preset").value = config.H264Preset || "", page.querySelector("#txtH264Crf").value = config.H264Crf || "", page.querySelector("#chkEnableSubtitleExtraction").checked = config.EnableSubtitleExtraction || !1, page.querySelector("#selectVideoDecoder").dispatchEvent(new CustomEvent("change", { + }); + page.querySelector("#chkHardwareEncoding").checked = config.EnableHardwareEncoding; + $("#selectVideoDecoder", page).val(config.HardwareAccelerationType); + $("#selectThreadCount", page).val(config.EncodingThreadCount); + $("#txtDownMixAudioBoost", page).val(config.DownMixAudioBoost); + page.querySelector(".txtEncoderPath").value = config.EncoderAppPathDisplay || ""; + $("#txtTranscodingTempPath", page).val(config.TranscodingTempPath || ""); + $("#txtVaapiDevice", page).val(config.VaapiDevice || ""); + page.querySelector("#selectH264Preset").value = config.H264Preset || ""; + page.querySelector("#txtH264Crf").value = config.H264Crf || ""; + page.querySelector("#chkEnableSubtitleExtraction").checked = config.EnableSubtitleExtraction || false; + page.querySelector("#selectVideoDecoder").dispatchEvent(new CustomEvent("change", { bubbles: !0 })), loading.hide() } From b9d21084f076f3ee3bbf580b2befe295bbc59854 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Fri, 8 Mar 2019 09:15:12 +0000 Subject: [PATCH 4/6] Update src/scripts/encodingsettings.js Co-Authored-By: ploughpuff <33969763+ploughpuff@users.noreply.github.com> --- src/scripts/encodingsettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/encodingsettings.js b/src/scripts/encodingsettings.js index 20f42e4f26..f02e4d488a 100644 --- a/src/scripts/encodingsettings.js +++ b/src/scripts/encodingsettings.js @@ -101,7 +101,7 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize var page = this; ApiClient.getNamedConfiguration("encoding").then(function(config) { ApiClient.getSystemInfo().then(function(systemInfo) { - loadPage(page, config, systemInfo) + loadPage(page, config, systemInfo); }) }) }) From 36a0df3c7d4398988378d961fb046fafc1a7a247 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Fri, 8 Mar 2019 09:15:19 +0000 Subject: [PATCH 5/6] Update src/scripts/encodingsettings.js Co-Authored-By: ploughpuff <33969763+ploughpuff@users.noreply.github.com> --- src/scripts/encodingsettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/encodingsettings.js b/src/scripts/encodingsettings.js index f02e4d488a..5ac984161b 100644 --- a/src/scripts/encodingsettings.js +++ b/src/scripts/encodingsettings.js @@ -16,7 +16,7 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize page.querySelector("#txtH264Crf").value = config.H264Crf || ""; page.querySelector("#chkEnableSubtitleExtraction").checked = config.EnableSubtitleExtraction || false; page.querySelector("#selectVideoDecoder").dispatchEvent(new CustomEvent("change", { - bubbles: !0 + bubbles: true })), loading.hide() } From 6565ec4009476f33bce4d93f3d415d77b9581c09 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Fri, 8 Mar 2019 09:25:45 +0000 Subject: [PATCH 6/6] Update src/scripts/encodingsettings.js Co-Authored-By: ploughpuff <33969763+ploughpuff@users.noreply.github.com> --- src/scripts/encodingsettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/encodingsettings.js b/src/scripts/encodingsettings.js index 5ac984161b..13b48151b8 100644 --- a/src/scripts/encodingsettings.js +++ b/src/scripts/encodingsettings.js @@ -16,7 +16,7 @@ define(["jQuery", "loading", "globalize", "dom"], function($, loading, globalize page.querySelector("#txtH264Crf").value = config.H264Crf || ""; page.querySelector("#chkEnableSubtitleExtraction").checked = config.EnableSubtitleExtraction || false; page.querySelector("#selectVideoDecoder").dispatchEvent(new CustomEvent("change", { - bubbles: true + bubbles: true })), loading.hide() }