aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-09-20 15:44:09 -0400
committerGitHub <noreply@github.com>2016-09-20 15:44:09 -0400
commitd61258f29033f53479104c45c32f15ba8d08e200 (patch)
treeec7a267273f841098688cd0ae8bda646dc80c005 /MediaBrowser.MediaEncoding
parent0ed7bd0350d001327f305724c979aef6e947bdf4 (diff)
parent61ee765de96eeffa28b0042d633166ba5d214850 (diff)
Merge pull request #2182 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding')
-rw-r--r--MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs15
1 files changed, 15 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 700af682b..5805127e6 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -393,6 +393,20 @@ namespace MediaBrowser.MediaEncoding.Probing
};
}
+ private string NormalizeSubtitleCodec(string codec)
+ {
+ if ((codec ?? string.Empty).IndexOf("PGS", StringComparison.OrdinalIgnoreCase) != -1)
+ {
+ codec = "PGSSUB";
+ }
+ else if ((codec ?? string.Empty).IndexOf("DVD", StringComparison.OrdinalIgnoreCase) != -1)
+ {
+ codec = "DVDSUB";
+ }
+
+ return codec;
+ }
+
/// <summary>
/// Converts ffprobe stream info to our MediaStream class
/// </summary>
@@ -474,6 +488,7 @@ namespace MediaBrowser.MediaEncoding.Probing
else if (string.Equals(streamInfo.codec_type, "subtitle", StringComparison.OrdinalIgnoreCase))
{
stream.Type = MediaStreamType.Subtitle;
+ stream.Codec = NormalizeSubtitleCodec(stream.Codec);
}
else if (string.Equals(streamInfo.codec_type, "video", StringComparison.OrdinalIgnoreCase))
{