From bf0c07abfe494211858362f458e3780f5e6c5bb3 Mon Sep 17 00:00:00 2001 From: Vasily Date: Tue, 31 Mar 2020 23:19:44 +0300 Subject: Merge pull request #2503 from nyanmisaka/vaapi Fix various bugs in HWA subtitle burn-in (cherry picked from commit 9aefb41512e8e2655c9c894180907d8ae60ae30e) Signed-off-by: Joshua M. Boniface --- MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs') diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 6284e0fd9..f7ed9fb1a 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -731,6 +731,14 @@ namespace MediaBrowser.MediaEncoding.Subtitles { var charset = CharsetDetector.DetectFromStream(stream).Detected?.EncodingName; + // UTF16 is automatically converted to UTF8 by FFmpeg, do not specify a character encoding + if ((path.EndsWith(".ass") || path.EndsWith(".ssa")) + && (string.Equals(charset, "utf-16le", StringComparison.OrdinalIgnoreCase) + || string.Equals(charset, "utf-16be", StringComparison.OrdinalIgnoreCase))) + { + charset = ""; + } + _logger.LogDebug("charset {0} detected for {Path}", charset ?? "null", path); return charset; -- cgit v1.2.3