diff options
| author | nyanmisaka <nst799610810@gmail.com> | 2021-12-25 00:33:17 +0800 |
|---|---|---|
| committer | nyanmisaka <nst799610810@gmail.com> | 2021-12-25 00:33:17 +0800 |
| commit | 728a5988b3801dc559efbaf278e1a75770884faf (patch) | |
| tree | bf48cbc6a85fbd96ddaf65d7ccf28ee78f6b385e /Jellyfin.Api/Helpers/DynamicHlsHelper.cs | |
| parent | 7db753d2471e6c8e0b003c75c1d40fc7b2f396da (diff) | |
| parent | 2e7d173188cc755ed56b8a45e3b18206afdc4b91 (diff) | |
Merge remote-tracking branch 'origin/master' into hwa
Diffstat (limited to 'Jellyfin.Api/Helpers/DynamicHlsHelper.cs')
| -rw-r--r-- | Jellyfin.Api/Helpers/DynamicHlsHelper.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs index 4abe4c5d5..02af2e435 100644 --- a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs +++ b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -462,6 +462,11 @@ namespace Jellyfin.Api.Helpers private void AddSubtitles(StreamState state, IEnumerable<MediaStream> subtitles, StringBuilder builder, ClaimsPrincipal user) { + if (state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Drop) + { + return; + } + var selectedIndex = state.SubtitleStream == null || state.SubtitleDeliveryMethod != SubtitleDeliveryMethod.Hls ? (int?)null : state.SubtitleStream.Index; const string Format = "#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"subs\",NAME=\"{0}\",DEFAULT={1},FORCED={2},AUTOSELECT=YES,URI=\"{3}\",LANGUAGE=\"{4}\""; |