浏览代码

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>
Dmitry Lyzo 2 年之前
父节点
当前提交
71a708cdb8
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      Jellyfin.Api/Helpers/DynamicHlsHelper.cs

+ 4 - 1
Jellyfin.Api/Helpers/DynamicHlsHelper.cs

@@ -9,6 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Models.StreamingDtos;
 using Jellyfin.Api.Models.StreamingDtos;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Configuration;
@@ -203,9 +204,11 @@ namespace Jellyfin.Api.Helpers
                 {
                 {
                     builder.Append(flacWaPlaylist);
                     builder.Append(flacWaPlaylist);
                 }
                 }
+                var encodingOptions = _serverConfigurationManager.GetEncodingOptions();
 
 
                 // Provide SDR HEVC entrance for backward compatibility.
                 // 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.IsNullOrEmpty(state.VideoStream.VideoRange)
                     && string.Equals(state.VideoStream.VideoRange, "HDR", StringComparison.OrdinalIgnoreCase)
                     && string.Equals(state.VideoStream.VideoRange, "HDR", StringComparison.OrdinalIgnoreCase)
                     && string.Equals(state.ActualOutputVideoCodec, "hevc", StringComparison.OrdinalIgnoreCase))
                     && string.Equals(state.ActualOutputVideoCodec, "hevc", StringComparison.OrdinalIgnoreCase))