diff options
| author | Dmitry Lyzo <ashephard0@gmail.com> | 2023-01-22 14:06:19 -0500 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2023-01-22 14:06:19 -0500 |
| commit | 71a708cdb851d1e91332b261b706e15cfc4bcf23 (patch) | |
| tree | a9ba1156070f8cd9487505ab440eacb0258ebdfe /Jellyfin.Api/Helpers/DynamicHlsHelper.cs | |
| parent | 2b1a7ddd32576b87c6c0c799d42c6fc07351c23d (diff) | |
Backport pull request #9092 from jellyfin/release-10.8.z
Don't add additional entries if HEVC encoding is disabled
Original-merge: 2a5efeb3bb5938b614cb159868e98d56487040c9
Merged-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
Backported-by: Joshua M. Boniface <joshua@boniface.me>
Diffstat (limited to 'Jellyfin.Api/Helpers/DynamicHlsHelper.cs')
| -rw-r--r-- | Jellyfin.Api/Helpers/DynamicHlsHelper.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs index 010b181f7..1310801c5 100644 --- a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs +++ b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs @@ -9,6 +9,7 @@ using System.Threading; using System.Threading.Tasks; using Jellyfin.Api.Extensions; using Jellyfin.Api.Models.StreamingDtos; +using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Net; using MediaBrowser.Controller.Configuration; @@ -203,9 +204,11 @@ namespace Jellyfin.Api.Helpers { builder.Append(flacWaPlaylist); } + var encodingOptions = _serverConfigurationManager.GetEncodingOptions(); // Provide SDR HEVC entrance for backward compatibility. - if (EncodingHelper.IsCopyCodec(state.OutputVideoCodec) + if (encodingOptions.AllowHevcEncoding + && EncodingHelper.IsCopyCodec(state.OutputVideoCodec) && !string.IsNullOrEmpty(state.VideoStream.VideoRange) && string.Equals(state.VideoStream.VideoRange, "HDR", StringComparison.OrdinalIgnoreCase) && string.Equals(state.ActualOutputVideoCodec, "hevc", StringComparison.OrdinalIgnoreCase)) |