alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 15:48:03 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix StreamInfo.ToUrl (#13808)

Browse Source
This commit is contained in:
Tim Eisele
2025-03-31 05:37:58 +02:00
committed by GitHub
parent 90a6cca92b
commit 824bafc32d
2 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Model/Dlna/StreamInfo.cs
View File

@@ -956,12 +956,10 @@ public class StreamInfo
sb.Append(AudioStreamIndex.Value.ToString(CultureInfo.InvariantCulture));
}
if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod != SubtitleDeliveryMethod.External && SubtitleStreamIndex != -1)
if (SubtitleStreamIndex.HasValue && (AlwaysBurnInSubtitleWhenTranscoding || SubtitleDeliveryMethod != SubtitleDeliveryMethod.External) && SubtitleStreamIndex != -1)
{
sb.Append("&SubtitleStreamIndex=");
sb.Append(SubtitleStreamIndex.Value.ToString(CultureInfo.InvariantCulture));
sb.Append("&SubtitleMethod=");
sb.Append(SubtitleDeliveryMethod.ToString());
}
if (VideoBitrate.HasValue)
@@ -1095,17 +1093,11 @@ public class StreamInfo
sb.Append(CopyTimestamps.ToString(CultureInfo.InvariantCulture));
}
if (RequireAvc)
{
sb.Append("&RequireAvc=");
sb.Append(RequireAvc.ToString(CultureInfo.InvariantCulture));
}
sb.Append("&RequireAvc=");
sb.Append(RequireAvc.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
if (EnableAudioVbrEncoding)
{
sb.Append("EnableAudioVbrEncoding=");
sb.Append(EnableAudioVbrEncoding.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
}
sb.Append("&EnableAudioVbrEncoding=");
sb.Append(EnableAudioVbrEncoding.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
}
var etag = MediaSource?.ETag;
@@ -1118,7 +1110,7 @@ public class StreamInfo
if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod != SubtitleDeliveryMethod.External)
{
sb.Append("&SubtitleMethod=");
sb.AppendJoin(',', SubtitleDeliveryMethod);
sb.Append(SubtitleDeliveryMethod);
}
if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod == SubtitleDeliveryMethod.Embed && SubtitleCodecs.Count != 0)