From c2f248f838f3978ce38083a6dfa0ee3fbf138ace Mon Sep 17 00:00:00 2001
From: Peter Maar <alset333@icloud.com>
Date: Sun, 22 Mar 2020 00:18:14 -0400
Subject: [PATCH 1/4] Add controls for DeinterlaceMethod

Add controls and US-English text for DeinterlaceMethod in encodingsettings. Uses the values referenced here https://github.com/jellyfin/jellyfin/pull/2639
---
 src/encodingsettings.html | 8 ++++++++
 src/strings/en-us.json    | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/encodingsettings.html b/src/encodingsettings.html
index bcdd86544e..6fbcc133a8 100644
--- a/src/encodingsettings.html
+++ b/src/encodingsettings.html
@@ -136,6 +136,14 @@
                     <div class="fieldDescription">${H264CrfHelp}</div>
                 </div>
 
+                <div class="selectContainer">
+                    <select is="emby-select" id="selectDeinterlaceMethod" label="${LabelDeinterlaceMethod}">
+                        <option value="yadif">Yadif</option>
+                        <option value="yadif_bob">Yadif Bob</option>
+                    </select>
+                    <div class="fieldDescription">${DeinterlaceMethodHelp}</div>
+                </div>
+
                 <div class="checkboxContainer checkboxContainer-withDescription">
                     <label>
                         <input is="emby-checkbox" type="checkbox" id="chkEnableSubtitleExtraction" />
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 62e8fa3f8f..a0e741380a 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -174,6 +174,7 @@
     "DefaultErrorMessage": "There was an error processing the request. Please try again later.",
     "DefaultMetadataLangaugeDescription": "These are your defaults and can be customized on a per-library basis.",
     "DefaultSubtitlesHelp": "Subtitles are loaded based on the default and forced flags in the embedded metadata. Language preferences are considered when multiple options are available.",
+    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when transcoding.",
     "Delete": "Delete",
     "DeleteDeviceConfirmation": "Are you sure you wish to delete this device? It will reappear the next time a user signs in with it.",
     "DeleteImage": "Delete Image",
@@ -599,6 +600,7 @@
     "LabelDefaultScreen": "Default screen:",
     "LabelDefaultUser": "Default user:",
     "LabelDefaultUserHelp": "Determines which user library should be displayed on connected devices. This can be overridden for each device using profiles.",
+    "LabelDeinterlaceMethod": "Deinterlacing method:",
     "LabelDeviceDescription": "Device description",
     "LabelDidlMode": "DIDL mode:",
     "LabelDiscNumber": "Disc number:",

From 0595686b4db0a96a55e9ddb4a7d68b0f04e37d6c Mon Sep 17 00:00:00 2001
From: Peter Maar <alset333@icloud.com>
Date: Sun, 5 Apr 2020 16:28:33 -0400
Subject: [PATCH 2/4] Clarify help text for "Deinterlacing method"

specify "transcoding interlaced content" instead of just "transcoding"

Co-Authored-By: Julien Machiels <julien.machiels@protonmail.com>
---
 src/strings/en-us.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index a0e741380a..1e4203a975 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -174,7 +174,7 @@
     "DefaultErrorMessage": "There was an error processing the request. Please try again later.",
     "DefaultMetadataLangaugeDescription": "These are your defaults and can be customized on a per-library basis.",
     "DefaultSubtitlesHelp": "Subtitles are loaded based on the default and forced flags in the embedded metadata. Language preferences are considered when multiple options are available.",
-    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when transcoding.",
+    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when transcoding interlaced content.",
     "Delete": "Delete",
     "DeleteDeviceConfirmation": "Are you sure you wish to delete this device? It will reappear the next time a user signs in with it.",
     "DeleteImage": "Delete Image",

From f078ce95e7ace3849bea4a5e4d2dfe2077ac695d Mon Sep 17 00:00:00 2001
From: Peter Maar <alset333@icloud.com>
Date: Sun, 5 Apr 2020 17:22:02 -0400
Subject: [PATCH 3/4] Add getter/setter for selectDeinterlaceMethod

---
 src/controllers/encodingsettings.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/controllers/encodingsettings.js b/src/controllers/encodingsettings.js
index ff140ed539..1b27188665 100644
--- a/src/controllers/encodingsettings.js
+++ b/src/controllers/encodingsettings.js
@@ -14,6 +14,7 @@ define(["jQuery", "loading", "globalize", "dom", "libraryMenu"], function ($, lo
         $("#txtVaapiDevice", page).val(config.VaapiDevice || "");
         page.querySelector("#selectEncoderPreset").value = config.EncoderPreset || "";
         page.querySelector("#txtH264Crf").value = config.H264Crf || "";
+        page.querySelector("#selectDeinterlaceMethod").value = config.DeinterlaceMethod || "";
         page.querySelector("#chkEnableSubtitleExtraction").checked = config.EnableSubtitleExtraction || false;
         page.querySelector("#chkEnableThrottling").checked = config.EnableThrottling || false;
         page.querySelector("#selectVideoDecoder").dispatchEvent(new CustomEvent("change", {
@@ -58,6 +59,7 @@ define(["jQuery", "loading", "globalize", "dom", "libraryMenu"], function ($, lo
                 config.VaapiDevice = $("#txtVaapiDevice", form).val();
                 config.EncoderPreset = form.querySelector("#selectEncoderPreset").value;
                 config.H264Crf = parseInt(form.querySelector("#txtH264Crf").value || "0");
+                config.DeinterlaceMethod = form.querySelector("#selectDeinterlaceMethod").value;
                 config.EnableSubtitleExtraction = form.querySelector("#chkEnableSubtitleExtraction").checked;
                 config.EnableThrottling = form.querySelector("#chkEnableThrottling").checked;
                 config.HardwareDecodingCodecs = Array.prototype.map.call(Array.prototype.filter.call(form.querySelectorAll(".chkDecodeCodec"), function (c) {

From c028c501d2fa1a9250df95c16c63c6254cf8f73f Mon Sep 17 00:00:00 2001
From: Peter Maar <alset333@icloud.com>
Date: Sun, 5 Apr 2020 17:24:57 -0400
Subject: [PATCH 4/4] Move Yadif & Yadif Bob into language strings instead of
 hard-coded

---
 src/encodingsettings.html | 4 ++--
 src/strings/en-us.json    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/encodingsettings.html b/src/encodingsettings.html
index 6fbcc133a8..5a005d8001 100644
--- a/src/encodingsettings.html
+++ b/src/encodingsettings.html
@@ -138,8 +138,8 @@
 
                 <div class="selectContainer">
                     <select is="emby-select" id="selectDeinterlaceMethod" label="${LabelDeinterlaceMethod}">
-                        <option value="yadif">Yadif</option>
-                        <option value="yadif_bob">Yadif Bob</option>
+                        <option value="yadif">${Yadif}</option>
+                        <option value="yadif_bob">${YadifBob}</option>
                     </select>
                     <div class="fieldDescription">${DeinterlaceMethodHelp}</div>
                 </div>
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 1e4203a975..0106e0089e 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1469,6 +1469,8 @@
     "XmlTvNewsCategoriesHelp": "Programs with these categories will be displayed as news programs. Separate multiple with '|'.",
     "XmlTvPathHelp": "A path to a XMLTV file. Jellyfin will read this file and periodically check it for updates. You are responsible for creating and updating the file.",
     "XmlTvSportsCategoriesHelp": "Programs with these categories will be displayed as sports programs. Separate multiple with '|'.",
+    "Yadif": "Yadif",
+    "YadifBob": "Yadif Bob",
     "Yes": "Yes",
     "Yesterday": "Yesterday"
 }