starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 21:37:59 +03:00
Code Issues 822 Packages Projects Releases 17 Wiki Activity

Merge pull request #17306 from theguymadmax/fix-strm-sub-protocol

Browse Source
This commit is contained in:
Bond-009
2026-07-13 20:14:20 +02:00
committed by GitHub
parent ebab369eac e2d9d592bc
commit cfeaef6180
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@@ -167,7 +167,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
{ {
if (fileInfo.Protocol == MediaProtocol.Http) if (fileInfo.Protocol == MediaProtocol.Http)
{ {
var result = await DetectCharset(fileInfo.Path, fileInfo.Protocol, cancellationToken).ConfigureAwait(false); var result = await DetectCharset(fileInfo.Path, cancellationToken).ConfigureAwait(false);
var detected = result.Detected; var detected = result.Detected;
if (detected is not null) if (detected is not null)
@@ -1104,7 +1104,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
} }
} }
var result = await DetectCharset(path, mediaSource.Protocol, cancellationToken).ConfigureAwait(false); var result = await DetectCharset(path, cancellationToken).ConfigureAwait(false);
var charset = result.Detected?.EncodingName ?? string.Empty; var charset = result.Detected?.EncodingName ?? string.Empty;
// UTF16 is automatically converted to UTF8 by FFmpeg, do not specify a character encoding // UTF16 is automatically converted to UTF8 by FFmpeg, do not specify a character encoding
@@ -1120,8 +1120,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return charset; return charset;
} }
private async Task<DetectionResult> DetectCharset(string path, MediaProtocol protocol, CancellationToken cancellationToken) private async Task<DetectionResult> DetectCharset(string path, CancellationToken cancellationToken)
{ {
var protocol = _mediaSourceManager.GetPathProtocol(path);
switch (protocol) switch (protocol)
{ {
case MediaProtocol.Http: case MediaProtocol.Http:
@@ -1141,7 +1142,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
} }
default: default:
throw new ArgumentOutOfRangeException(nameof(protocol), protocol, "Unsupported protocol"); throw new NotSupportedException($"Unsupported protocol: {protocol}");
} }
} }