Merge branch 'jellyfin:master' into ci-autoversion-packages

4 files changed, 49 insertions, 8 deletions

diff --git a/Emby.Server.Implementations/Localization/Core/fa.json b/Emby.Server.Implementations/Localization/Core/fa.json
index 3d3b3533f..6960ff007 100644
--- a/Emby.Server.Implementations/Localization/Core/fa.json
+++ b/Emby.Server.Implementations/Localization/Core/fa.json
@@ -118,5 +118,6 @@
     "Default": "پیشفرض",
     "TaskCleanActivityLogDescription": "ورودی‌های قدیمی‌تر از سن تنظیم شده در سیاهه فعالیت را حذف می‌کند.",
     "TaskCleanActivityLog": "پاکسازی سیاهه فعالیت",
-    "Undefined": "تعریف نشده"
+    "Undefined": "تعریف نشده",
+    "TaskOptimizeDatabase": "بهینه سازی پایگاه داده"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/ja.json b/Emby.Server.Implementations/Localization/Core/ja.json
index 7f41561ec..2588f1e8c 100644
--- a/Emby.Server.Implementations/Localization/Core/ja.json
+++ b/Emby.Server.Implementations/Localization/Core/ja.json
@@ -16,7 +16,7 @@
     "Folders": "フォルダー",
     "Genres": "ジャンル",
     "HeaderAlbumArtists": "アルバムアーティスト",
-    "HeaderContinueWatching": "視聴を続ける",
+    "HeaderContinueWatching": "続きを見る",
     "HeaderFavoriteAlbums": "お気に入りのアルバム",
     "HeaderFavoriteArtists": "お気に入りのアーティスト",
     "HeaderFavoriteEpisodes": "お気に入りのエピソード",
diff --git a/Emby.Server.Implementations/Localization/Core/zu.json b/Emby.Server.Implementations/Localization/Core/zu.json
index 0967ef424..b5f4b920f 100644
--- a/Emby.Server.Implementations/Localization/Core/zu.json
+++ b/Emby.Server.Implementations/Localization/Core/zu.json
@@ -1 +1,29 @@
-{}
+{
+    "TasksApplicationCategory": "Ukusetshenziswa",
+    "TasksLibraryCategory": "Umtapo",
+    "TasksMaintenanceCategory": "Ukunakekela",
+    "User": "Umsebenzisi",
+    "Undefined": "Akuchaziwe",
+    "System": "Isistimu",
+    "Sync": "Vumelanisa",
+    "Songs": "Amaculo",
+    "Shows": "Izinhlelo",
+    "Plugin": "Isijobelelo",
+    "Playlists": "Izinhla Zokudlalayo",
+    "Photos": "Izithombe",
+    "Music": "Umculo",
+    "Movies": "Amamuvi",
+    "Latest": "lwakamuva",
+    "Inherit": "Ngefa",
+    "Forced": "Kuphoqiwe",
+    "Application": "Ukusetshenziswa",
+    "Genres": "Izinhlobo",
+    "Folders": "Izikhwama",
+    "Favorites": "Izintandokazi",
+    "Default": "Okumisiwe",
+    "Collections": "Amaqoqo",
+    "Channels": "Amashaneli",
+    "Books": "Izincwadi",
+    "Artists": "Abadlali",
+    "Albums": "Ama-albhamu"
+}
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 1b3a4fa0f..bf6146e2b 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -649,11 +649,6 @@ namespace MediaBrowser.MediaEncoding.Probing
                 stream.IsAVC = false;
             }
 
-            if (!string.IsNullOrWhiteSpace(streamInfo.FieldOrder) && !string.Equals(streamInfo.FieldOrder, "progressive", StringComparison.OrdinalIgnoreCase))
-            {
-                stream.IsInterlaced = true;
-            }
-
             // Filter out junk
             if (!string.IsNullOrWhiteSpace(streamInfo.CodecTagString) && !streamInfo.CodecTagString.Contains("[0]", StringComparison.OrdinalIgnoreCase))
             {
@@ -725,6 +720,23 @@ namespace MediaBrowser.MediaEncoding.Probing
                 stream.AverageFrameRate = GetFrameRate(streamInfo.AverageFrameRate);
                 stream.RealFrameRate = GetFrameRate(streamInfo.RFrameRate);
 
+                // Some interlaced H.264 files in mp4 containers using MBAFF coding aren't flagged as being interlaced by FFprobe,
+                // so for H.264 files we also calculate the frame rate from the codec time base and check if it is double the reported
+                // frame rate (both rounded to the nearest integer) to determine if the file is interlaced
+                float roundedTimeBaseFPS = MathF.Round(1 / GetFrameRate(stream.CodecTimeBase) ?? 0);
+                float roundedDoubleFrameRate = MathF.Round(stream.AverageFrameRate * 2 ?? 0);
+
+                bool videoInterlaced = !string.IsNullOrWhiteSpace(streamInfo.FieldOrder)
+                    && !string.Equals(streamInfo.FieldOrder, "progressive", StringComparison.OrdinalIgnoreCase);
+                bool h264MbaffCoded = string.Equals(stream.Codec, "h264", StringComparison.OrdinalIgnoreCase)
+                    && string.IsNullOrWhiteSpace(streamInfo.FieldOrder)
+                    && roundedTimeBaseFPS == roundedDoubleFrameRate;
+
+                if (videoInterlaced || h264MbaffCoded)
+                {
+                    stream.IsInterlaced = true;
+                }
+
                 if (isAudio
                     || string.Equals(stream.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase)
                     || string.Equals(stream.Codec, "gif", StringComparison.OrdinalIgnoreCase)