Просмотр исходного кода

Merge pull request #7712 from jellyfin/fix-hevc-disable-option

Joshua M. Boniface 3 лет назад
Родитель
Сommit
5a9e5e0d5d
1 измененных файлов с 8 добавлено и 1 удалено
  1. 8 1
      MediaBrowser.Model/Dlna/StreamBuilder.cs

+ 8 - 1
MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -771,7 +771,14 @@ namespace MediaBrowser.Model.Dlna
             // Prefer matching video codecs
             // Prefer matching video codecs
             var videoCodecs = ContainerProfile.SplitValue(videoCodec);
             var videoCodecs = ContainerProfile.SplitValue(videoCodec);
             var directVideoCodec = ContainerProfile.ContainsContainer(videoCodecs, videoStream?.Codec) ? videoStream?.Codec : null;
             var directVideoCodec = ContainerProfile.ContainsContainer(videoCodecs, videoStream?.Codec) ? videoStream?.Codec : null;
-            playlistItem.VideoCodecs = directVideoCodec != null ? new[] { directVideoCodec } : videoCodecs;
+            if (directVideoCodec != null)
+            {
+                // merge directVideoCodec to videoCodecs
+                Array.Resize(ref videoCodecs, videoCodecs.Length + 1);
+                videoCodecs[^1] = directVideoCodec;
+            }
+
+            playlistItem.VideoCodecs = videoCodecs;
 
 
             // Copy video codec options as a starting point, this applies to transcode and direct-stream
             // Copy video codec options as a starting point, this applies to transcode and direct-stream
             playlistItem.MaxFramerate = videoStream?.AverageFrameRate;
             playlistItem.MaxFramerate = videoStream?.AverageFrameRate;