Merge pull request #1798 from orryverducci/deinterlace-improvements

Add new deinterlacing options
2025-03-30 19:56:21 +00:00 · 2020-09-05 17:25:24 +09:00 · 2020-09-05 17:25:24 +09:00 · 3ee2750f5d
commit 3ee2750f5d
parent 41a79924a6 5f96b19772
27 changed files with 20 additions and 27 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -38,6 +38,7 @@
 - [GuilhermeHideki](https://github.com/GuilhermeHideki)
 - [Andrei Oanca](https://github.com/OancaAndrei)
 - [Cromefire_](https://github.com/cromefire)
+ - [Orry Verducci](https://github.com/orryverducci)

 # Emby Contributors

--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@ -153,11 +153,19 @@
                <div class="selectContainer">
                    <select is="emby-select" id="selectDeinterlaceMethod" label="${LabelDeinterlaceMethod}">
                        <option value="yadif">${Yadif}</option>
-                        <option value="yadif_bob">${YadifBob}</option>
+                        <option value="bwdif">${Bwdif}</option>
                    </select>
                    <div class="fieldDescription">${DeinterlaceMethodHelp}</div>
                </div>

+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkDoubleRateDeinterlacing" />
+                        <span>${UseDoubleRateDeinterlacing}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${UseDoubleRateDeinterlacingHelp}</div>
+                </div>
+
                <div class="checkboxContainer checkboxContainer-withDescription">
                    <label>
                        <input is="emby-checkbox" type="checkbox" id="chkEnableSubtitleExtraction" />
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@ -22,6 +22,7 @@ import libraryMenu from 'libraryMenu';
        page.querySelector('#selectEncoderPreset').value = config.EncoderPreset || '';
        page.querySelector('#txtH264Crf').value = config.H264Crf || '';
        page.querySelector('#selectDeinterlaceMethod').value = config.DeinterlaceMethod || '';
+        page.querySelector('#chkDoubleRateDeinterlacing').checked = config.DeinterlaceDoubleRate;
        page.querySelector('#chkEnableSubtitleExtraction').checked = config.EnableSubtitleExtraction || false;
        page.querySelector('#chkEnableThrottling').checked = config.EnableThrottling || false;
        page.querySelector('#selectVideoDecoder').dispatchEvent(new CustomEvent('change', {
@ -68,6 +69,7 @@ import libraryMenu from 'libraryMenu';
                config.EncoderPreset = form.querySelector('#selectEncoderPreset').value;
                config.H264Crf = parseInt(form.querySelector('#txtH264Crf').value || '0');
                config.DeinterlaceMethod = form.querySelector('#selectDeinterlaceMethod').value;
+                config.DeinterlaceDoubleRate = form.querySelector('#chkDoubleRateDeinterlacing').checked;
                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) {
--- a/src/strings/bg-bg.json
+++ b/src/strings/bg-bg.json
@ -1018,7 +1018,6 @@
    "WriteAccessRequired": "Джелифин изисква достъп с права за запис до тази папка. Моля, осигурете достъп с права за запис и опитайте отново.",
    "PathNotFound": "Пътят не можа да бъде намерен. Моля, уверете се, че пътят е валиден и опитайте отново.",
    "Yesterday": "Вчера",
-    "YadifBob": "YADIF х2",
    "Yadif": "YADIF (Yet Another DeInterlacing Filter)",
    "XmlTvSportsCategoriesHelp": "Програмите от тези категории ще се показват като спортни програми.За разделяне на множество използвайте '|'.",
    "XmlTvPathHelp": "Път до XMLTV файла.Джелифин ще чете от този файл и периодично ще го проверява за актуализации.Ваша грижа е да го създадете и редовно да го обновявате.",
--- a/src/strings/cs.json
+++ b/src/strings/cs.json
@ -1267,7 +1267,6 @@
    "PathNotFound": "Cesta nebyla nalezena. Zkontrolujte, zda je platná a zkuste to znovu.",
    "WeeklyAt": "V {0} v {1}",
    "LastSeen": "Naposledy zobrazené {0}",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "LabelLibraryPageSizeHelp": "Určuje počet položek k zobrazení na stránce knihovny. Nastavte na 0 pro vypnutí stránkování.",
    "LabelLibraryPageSize": "Velikost stránky knihovny:",
--- a/src/strings/da.json
+++ b/src/strings/da.json
@ -1200,7 +1200,6 @@
    "ListPaging": "{0}-{1} af {2}",
    "WriteAccessRequired": "Jellyfin Server kræver skriveadgang til denne mappe. Sørg for skriveadgang, og prøv igen.",
    "PathNotFound": "Stien blev ikke fundet. Sørg for, at stien er gyldig, og prøv igen.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "TabNetworking": "Netværk",
    "SubtitleOffset": "Undertekst Offset",
--- a/src/strings/de.json
+++ b/src/strings/de.json
@ -1267,7 +1267,6 @@
    "AlbumArtist": "Album Künstler",
    "Album": "Album",
    "BoxSet": "Box Set",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "LabelLibraryPageSizeHelp": "Setzt die Anzahl der auf einer Seite angezeigten Objekte. Setze auf 0, um alle Elemente auf einer Seite anzuzeigen.",
    "LabelLibraryPageSize": "Bibliothek Seiten Größe:",
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@ -1260,8 +1260,8 @@
    "ListPaging": "{0}-{1} of {2}",
    "WriteAccessRequired": "Jellyfin requires write access to this folder. Please ensure write access and try again.",
    "PathNotFound": "The path could not be found. Please ensure the path is valid and try again.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
+    "Bwdif": "BWDIF",
    "Season": "Season",
    "PreferEmbeddedEpisodeInfosOverFileNames": "Prefer embedded episode information over filenames",
    "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "This uses the episode information from the embedded metadata if available.",
@ -1271,7 +1271,9 @@
    "LabelLibraryPageSize": "Library page size:",
    "LabelDeinterlaceMethod": "Deinterlacing method:",
    "Episode": "Episode",
-    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when transcoding interlaced content.",
+    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when software transcoding interlaced content. When hardware acceleration supporting hardware deinterlacing is enabled the hardware deinterlacer will be used instead of this setting.",
+    "UseDoubleRateDeinterlacing": "Double the frame rate when deinterlacing",
+    "UseDoubleRateDeinterlacingHelp": "This setting uses the field rate when deinterlacing, often referred to as bob deinterlacing, which doubles the frame rate of the video to provide full motion like what you would see when viewing interlaced video on a TV.",
    "ClientSettings": "Client Settings",
    "BoxSet": "Box Set",
    "Artist": "Artist",
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@ -145,7 +145,7 @@
    "ErrorDefault": "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 interlaced content.",
+    "DeinterlaceMethodHelp": "Select the deinterlacing method to use when software transcoding interlaced content. When hardware acceleration supporting hardware deinterlacing is enabled the hardware deinterlacer will be used instead of this setting.",
    "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",
@ -1293,6 +1293,8 @@
    "Transcoding": "Transcoding",
    "Tuesday": "Tuesday",
    "TvLibraryHelp": "Review the {0}TV naming guide{1}.",
+    "UseDoubleRateDeinterlacing": "Double the frame rate when deinterlacing",
+    "UseDoubleRateDeinterlacingHelp": "This setting uses the field rate when deinterlacing, often referred to as bob deinterlacing, which doubles the frame rate of the video to provide full motion like what you would see when viewing interlaced video on a TV.",
    "Uniform": "Uniform",
    "UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?",
    "HeaderUninstallPlugin": "Uninstall Plugin",
@ -1346,7 +1348,7 @@
    "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",
+    "Bwdif": "BWDIF",
    "Yes": "Yes",
    "Yesterday": "Yesterday",
    "PathNotFound": "The path could not be found. Please ensure the path is valid and try again.",
--- a/src/strings/es-ar.json
+++ b/src/strings/es-ar.json
@ -1186,7 +1186,6 @@
    "WriteAccessRequired": "El servidor Jellyfin requiere acceso de escritura a esta carpeta. Asegúrese del acceso de escritura e intente nuevamente.",
    "PathNotFound": "La ruta no se pudo encontrar. Asegúrese de que la ruta sea válida e intente nuevamente.",
    "Yes": "Sí",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "XmlTvSportsCategoriesHelp": "Los programas con estas categorías se mostrarán como programas deportivos. Separe múltiples con '|'.",
    "XmlTvPathHelp": "Una ruta a un archivo XMLTV. Jellyfin leerá este archivo y lo revisará periódicamente en busca de actualizaciones. Usted es responsable de crear y actualizar el archivo.",
--- a/src/strings/es-mx.json
+++ b/src/strings/es-mx.json
@ -1267,7 +1267,6 @@
    "AllowFfmpegThrottling": "Regular transcodificaciones",
    "AlbumArtist": "Artista del álbum",
    "Album": "Álbum",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "LabelDeinterlaceMethod": "Método de desentrelazado:",
    "DeinterlaceMethodHelp": "Seleccione el método de desentrelazado que se usará al transcodificar contenido entrelazado.",
--- a/src/strings/es.json
+++ b/src/strings/es.json
@ -1275,7 +1275,6 @@
    "LabelLibraryPageSize": "Tamaño de la página de la biblioteca:",
    "LabelLibraryPageSizeHelp": "Establece la cantidad de artículos a mostrar en una página de la biblioteca. Ponlo en 0 para desactivar la paginación.",
    "UnsupportedPlayback": "No es posible desencriptar contenido protegido mediante DRM; sin embargo se intentará su reproducción. Algunos archivos pueden aparecer completamente negros debido a encriptación u otras características no soportadas, como títulos interactivos.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "ButtonTogglePlaylist": "Lista de reproducción",
    "Filter": "Filtro",
--- a/src/strings/es_419.json
+++ b/src/strings/es_419.json
@ -31,7 +31,6 @@
    "Actor": "Actor",
    "AccessRestrictedTryAgainLater": "El acceso está restringido actualmente. Por favor, inténtalo más tarde.",
    "Absolute": "Absoluto",
-    "YadifBob": "YADIF Bob",
    "Trailers": "Trailers",
    "OptionResElement": "elemento reanudable",
    "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)",
--- a/src/strings/fa.json
+++ b/src/strings/fa.json
@ -406,7 +406,6 @@
    "ListPaging": "{0}-{1} از {2}",
    "Yesterday": "دیروز",
    "Yes": "بلی",
-    "YadifBob": "Yadif Bob",
    "Yadif": "Yadif",
    "ValueConditions": "شرایط: {0}",
    "ValueCodec": "کدک: {0}",
--- a/src/strings/fi.json
+++ b/src/strings/fi.json
@ -422,7 +422,6 @@
    "HeaderFetchImages": "Hae kuvia:",
    "Filters": "Suodattimet",
    "FastForward": "Hyppää eteenpäin",
-    "YadifBob": "YADIF Bob",
    "MessageInvalidUser": "Väärä käyttäjätunnus tai salasana. Yritä uudelleen.",
    "MessageConfirmRestart": "Haluatko varmasti uudelleenkäynnistää Jellyfin-palvelimen?",
    "MessageConfirmProfileDeletion": "Haluatko varmasti poistaa tämän profiilin?",
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@ -1267,7 +1267,6 @@
    "ListPaging": "{0}-{1} de {2}",
    "WriteAccessRequired": "Jellyfin a besoin d'un accès en écriture à ce dossier. Merci de vérifier l’accès en écriture et réessayez.",
    "PathNotFound": "Le chemin d'accès n'a pas pu être trouvé. Merci de le vérifier et de réessayer.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "LabelDeinterlaceMethod": "Méthode de désentrelacement :",
    "DeinterlaceMethodHelp": "Sélectionnes la méthode de désentrelacement à utiliser lors du transcodage de contenu entrelacé.",
--- a/src/strings/hu.json
+++ b/src/strings/hu.json
@ -1272,7 +1272,6 @@
    "LabelDeinterlaceMethod": "Deinterlacing mód:",
    "DeinterlaceMethodHelp": "Válassza ki a váltottsorosság megszűntetéséhez használandó módszert a váltottsoros tartalmak transzkódolásakor.",
    "UnsupportedPlayback": "Jellyfin nem tud DRM-titkosított tartalmak dekriptálására, ettől függetlenül a lejátszással mindig megpróbálkozik. Néhány fájl emiatt teljesen fekete képernyőt ad, amely vagy a titkosítás miatt van, vagy nem olyan nem támogatott tartalmak miatt, mint az interaktív címek.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "ButtonTogglePlaylist": "Lejátszási listák",
    "Filter": "Szűrés",
--- a/src/strings/it.json
+++ b/src/strings/it.json
@ -1264,7 +1264,6 @@
    "ListPaging": "{0}-{1} di {2}",
    "WriteAccessRequired": "Jellyfin richiede il permesso di scrittura su questa cartella. Verificare l'autorizzazione e riprovare.",
    "PathNotFound": "Percorso non trovato. Assicurarsi che sia valido e riprovare.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "Season": "Stagione",
    "Movie": "Film",
--- a/src/strings/nb.json
+++ b/src/strings/nb.json
@ -1270,7 +1270,6 @@
    "ListPaging": "{0}-{1} av {2}",
    "WriteAccessRequired": "Jellyfin krever skrivetilgang til denne mappen. Vennligst påse at skrivetilgang er gitt og prøv igjen.",
    "PathNotFound": "Banen ble ikke funnet. Påse at banen er gyldig og prøv igjen.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "SyncPlayAccessHelp": "Velg tilgangsnivået denne brukeren skal ha til SyncPlay-funksjonen. SyncPlay muliggjør synkronisert avspilling med andre enheter.",
    "Filter": "Filter",
--- a/src/strings/nl.json
+++ b/src/strings/nl.json
@ -1271,7 +1271,6 @@
    "ListPaging": "{0}-{1} van de {2}",
    "WriteAccessRequired": "De Jellyfin Server vereist schrijftoegang tot deze map. Zorg evoor dat Jellyfin schrijftoegang tot de map heeft en probeer opnieuw.",
    "PathNotFound": "Het pad kan niet gevonden worden. Zorg ervoor dat het pad correct is en probeer opnieuw.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "SelectAdminUsername": "Selecteer een gebruikersnaam voor het beheerder account.",
    "ButtonTogglePlaylist": "Afspeellijst",
--- a/src/strings/pl.json
+++ b/src/strings/pl.json
@ -1276,7 +1276,6 @@
    "ListPaging": "{0}-{1} z {2}",
    "WriteAccessRequired": "Jellyfin wymaga praw zapisu do tego katalogu. Upewnij się, że prawa zapisu zostały przyznane i spróbuj ponownie.",
    "PathNotFound": "Ścieżka nie została znaleziona. Upewnij się, że ścieżka jest poprawna i spróbuj ponownie.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "Writers": "Scenariusz",
    "ViewAlbumArtist": "Zobacz wykonawcę albumu",
--- a/src/strings/pt-br.json
+++ b/src/strings/pt-br.json
@ -1259,7 +1259,6 @@
    "ListPaging": "{0}-{1} de {2}",
    "WriteAccessRequired": "O Jellyfin necessita de acesso de escrita para essa pasta. Garanta o acesso e tente novamente.",
    "PathNotFound": "O caminho não pôde ser encontrado. Por favor certifique-se da validade e tente novamente.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "Season": "Temporada",
    "Person": "Pessoa",
--- a/src/strings/ru.json
+++ b/src/strings/ru.json
@ -1248,7 +1248,6 @@
    "PlaybackErrorNoCompatibleStream": "Этот клиент несовместим с медиаданными, а сервер не отправляет медиаданные в совместимом формате.",
    "AllowFfmpegThrottlingHelp": "Когда перекодирование или переупаковка достаточно далеко опережают текущую позицию воспроизведения, процесс приостанавливается, так что он использует меньше ресурсов. Это наиболее полезно, когда вы редко меняете позиции в видео. Выключите это, если у вас возникли проблемы с воспроизведением.",
    "OnWakeFromSleep": "При пробуждении ото сна",
-    "YadifBob": "YADIF с удвоением",
    "OnApplicationStartup": "При запуске приложения",
    "EveryXHours": "Каждые {0} часов",
    "EveryHour": "Каждый час",
--- a/src/strings/sk.json
+++ b/src/strings/sk.json
@ -1261,7 +1261,6 @@
    "ListPaging": "{0}-{1} z {2}",
    "WriteAccessRequired": "Server vyžaduje práva na zapisovanie do tohoto priečinku. Prosím, uistite sa že má práva na zapisovanie a skúste to znova.",
    "PathNotFound": "Táto cesta nebola nájdená. Prosím, uistite sa že cesta je správna a skúste to znovu.",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "Season": "Séria",
    "Person": "Osoba",
--- a/src/strings/sv.json
+++ b/src/strings/sv.json
@ -1269,7 +1269,6 @@
    "LabelDeinterlaceMethod": "Deinterlacing-metod:",
    "WeeklyAt": "{0}s vid {1}",
    "LastSeen": "Senast sedd {0}",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "Filter": "Filter",
    "New": "Ny",
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@ -1267,7 +1267,6 @@
    "EveryXMinutes": "每 {0} 分钟",
    "WriteAccessRequired": "Jellyfin需要此文件夹的写入权限。请确认是否拥有写入权限并重试。",
    "PathNotFound": "无法找到此路径。请确认路径有效并重试。",
-    "YadifBob": "YADIF Bob",
    "Yadif": "YADIF",
    "LabelDeinterlaceMethod": "反交错方法：",
    "DeinterlaceMethodHelp": "选择对隔行扫描内容进行转码时所用的反交错方法。",
--- a/src/strings/zh-tw.json
+++ b/src/strings/zh-tw.json
@ -1250,7 +1250,6 @@
    "Artist": "演出者",
    "AlbumArtist": "專輯歌手",
    "Album": "專輯",
-    "YadifBob": "YADIF Bob",
    "WriteAccessRequired": "伺服器需要此資料夾的寫入權限，請確認是否擁有寫入權限並重試。",
    "PathNotFound": "無法找到此路徑，請確認路徑可用並重試。",
    "Yadif": "YADIF",