Browse Source

Merge pull request #9671 from nyanmisaka/fix-canvas-dvbsub

Joshua M. Boniface 2 năm trước cách đây
mục cha
commit
eba95cc7f0

+ 4 - 1
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -666,9 +666,12 @@ namespace MediaBrowser.Controller.MediaEncoding
 
 
         public string GetGraphicalSubCanvasSize(EncodingJobInfo state)
         public string GetGraphicalSubCanvasSize(EncodingJobInfo state)
         {
         {
+            // DVBSUB and DVDSUB use the fixed canvas size 720x576
             if (state.SubtitleStream != null
             if (state.SubtitleStream != null
                 && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode
                 && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode
-                && !state.SubtitleStream.IsTextSubtitleStream)
+                && !state.SubtitleStream.IsTextSubtitleStream
+                && !string.Equals(state.SubtitleStream.Codec, "DVBSUB", StringComparison.OrdinalIgnoreCase)
+                && !string.Equals(state.SubtitleStream.Codec, "DVDSUB", StringComparison.OrdinalIgnoreCase))
             {
             {
                 var inW = state.VideoStream?.Width;
                 var inW = state.VideoStream?.Width;
                 var inH = state.VideoStream?.Height;
                 var inH = state.VideoStream?.Height;