From 9a740344be757c2ab9a3f434295622573c39b181 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Fri, 30 Dec 2022 08:24:06 -0700
Subject: [PATCH] Add support for .sup subtitle (#8808)

Fixes https://github.com/jellyfin/jellyfin/issues/8628
---
 Emby.Dlna/Profiles/DefaultProfile.cs                 | 12 ++++++++++++
 Emby.Naming/Common/NamingOptions.cs                  |  1 +
 MediaBrowser.Controller/Entities/BaseItem.cs         |  1 +
 .../MediaEncoding/EncodingHelper.cs                  |  4 +++-
 MediaBrowser.Model/Entities/MediaStream.cs           | 11 ++++++-----
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Emby.Dlna/Profiles/DefaultProfile.cs b/Emby.Dlna/Profiles/DefaultProfile.cs
index 23437f1bdf..54a0a87a89 100644
--- a/Emby.Dlna/Profiles/DefaultProfile.cs
+++ b/Emby.Dlna/Profiles/DefaultProfile.cs
@@ -92,6 +92,12 @@ namespace Emby.Dlna.Profiles
                     Method = SubtitleDeliveryMethod.External,
                 },
 
+                new SubtitleProfile
+                {
+                    Format = "sup",
+                    Method = SubtitleDeliveryMethod.External
+                },
+
                 new SubtitleProfile
                 {
                     Format = "srt",
@@ -140,6 +146,12 @@ namespace Emby.Dlna.Profiles
                     Method = SubtitleDeliveryMethod.Embed
                 },
 
+                new SubtitleProfile
+                {
+                    Format = "sup",
+                    Method = SubtitleDeliveryMethod.Embed
+                },
+
                 new SubtitleProfile
                 {
                     Format = "subrip",
diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index 03fa65b4eb..54f62a1570 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -169,6 +169,7 @@ namespace Emby.Naming.Common
                 ".srt",
                 ".ssa",
                 ".sub",
+                ".sup",
                 ".vtt",
             };
 
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 49dd151f36..f2c2007f7a 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -56,6 +56,7 @@ namespace MediaBrowser.Controller.Entities
             ".srt",
             ".vtt",
             ".sub",
+            ".sup",
             ".idx",
             ".txt",
             ".edl",
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 7264c5eed0..b40c224d5d 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -938,8 +938,10 @@ namespace MediaBrowser.Controller.MediaEncoding
                 && state.SubtitleStream.IsExternal)
             {
                 var subtitlePath = state.SubtitleStream.Path;
+                var subtitleExtension = Path.GetExtension(subtitlePath);
 
-                if (string.Equals(Path.GetExtension(subtitlePath), ".sub", StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(subtitleExtension, ".sub", StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(subtitleExtension, ".sup", StringComparison.OrdinalIgnoreCase))
                 {
                     var idxFile = Path.ChangeExtension(subtitlePath, ".idx");
                     if (File.Exists(idxFile))
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 344ebaf808..47341f4e17 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -635,11 +635,12 @@ namespace MediaBrowser.Model.Entities
 
             // sub = external .sub file
 
-            return !codec.Contains("pgs", StringComparison.OrdinalIgnoreCase) &&
-                   !codec.Contains("dvd", StringComparison.OrdinalIgnoreCase) &&
-                   !codec.Contains("dvbsub", StringComparison.OrdinalIgnoreCase) &&
-                   !string.Equals(codec, "sub", StringComparison.OrdinalIgnoreCase) &&
-                   !string.Equals(codec, "dvb_subtitle", StringComparison.OrdinalIgnoreCase);
+            return !codec.Contains("pgs", StringComparison.OrdinalIgnoreCase)
+                   && !codec.Contains("dvd", StringComparison.OrdinalIgnoreCase)
+                   && !codec.Contains("dvbsub", StringComparison.OrdinalIgnoreCase)
+                   && !string.Equals(codec, "sub", StringComparison.OrdinalIgnoreCase)
+                   && !string.Equals(codec, "sup", StringComparison.OrdinalIgnoreCase)
+                   && !string.Equals(codec, "dvb_subtitle", StringComparison.OrdinalIgnoreCase);
         }
 
         public bool SupportsSubtitleConversionTo(string toCodec)