aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
diff options
context:
space:
mode:
authorShadowghost <Ghost_of_Stone@web.de>2022-08-13 21:46:33 -0400
committerJoshua Boniface <joshua@boniface.me>2022-08-13 21:46:33 -0400
commit3e5cf9395fb9493a4a4324c1dde5390fb85870a4 (patch)
treebca28244630093c1bbca700b461d7106dcca825f /MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
parent63d943aab92a4b5f69e625a269eb830bcbfb4d22 (diff)
Backport pull request #8182 from jellyfin/release-10.8.z
Extract external subs from container before determining characterset Original-merge: 1faee43b1103428392d305cb0d1b46ff3ab6b5fc Merged-by: Bond-009 <bond.009@outlook.com> Backported-by: Joshua Boniface <joshua@boniface.me>
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
index 4483cf708..5bf83a9e3 100644
--- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -6,7 +6,8 @@ using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.MediaEncoding
{
@@ -37,11 +38,11 @@ namespace MediaBrowser.Controller.MediaEncoding
/// <summary>
/// Gets the subtitle language encoding parameter.
/// </summary>
- /// <param name="path">The path.</param>
+ /// <param name="subtitleStream">The subtitle stream.</param>
/// <param name="language">The language.</param>
- /// <param name="protocol">The protocol.</param>
+ /// <param name="mediaSource">The media source.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>System.String.</returns>
- Task<string> GetSubtitleFileCharacterSet(string path, string language, MediaProtocol protocol, CancellationToken cancellationToken);
+ Task<string> GetSubtitleFileCharacterSet(MediaStream subtitleStream, string language, MediaSourceInfo mediaSource, CancellationToken cancellationToken);
}
}