Selaa lähdekoodia

Fix HLS playback of m4a files with mjpeg stream (#10069)

lonebyte 1 vuosi sitten
vanhempi
sitoutus
74f61fbd79
1 muutettua tiedostoa jossa 7 lisäystä ja 5 poistoa
  1. 7 5
      Jellyfin.Api/Controllers/DynamicHlsController.cs

+ 7 - 5
Jellyfin.Api/Controllers/DynamicHlsController.cs

@@ -1721,14 +1721,17 @@ public class DynamicHlsController : BaseJellyfinApiController
 
 
         if (!state.IsOutputVideo)
         if (!state.IsOutputVideo)
         {
         {
+            var audioTranscodeParams = string.Empty;
+
+            // -vn to drop any video streams
+            audioTranscodeParams += "-vn";
+
             if (EncodingHelper.IsCopyCodec(audioCodec))
             if (EncodingHelper.IsCopyCodec(audioCodec))
             {
             {
-                return "-acodec copy" + bitStreamArgs + strictArgs;
+                return audioTranscodeParams + " -acodec copy" + bitStreamArgs + strictArgs;
             }
             }
 
 
-            var audioTranscodeParams = string.Empty;
-
-            audioTranscodeParams += "-acodec " + audioCodec + bitStreamArgs + strictArgs;
+            audioTranscodeParams += " -acodec " + audioCodec + bitStreamArgs + strictArgs;
 
 
             var audioBitrate = state.OutputAudioBitrate;
             var audioBitrate = state.OutputAudioBitrate;
             var audioChannels = state.OutputAudioChannels;
             var audioChannels = state.OutputAudioChannels;
@@ -1756,7 +1759,6 @@ public class DynamicHlsController : BaseJellyfinApiController
                 audioTranscodeParams += " -ar " + state.OutputAudioSampleRate.Value.ToString(CultureInfo.InvariantCulture);
                 audioTranscodeParams += " -ar " + state.OutputAudioSampleRate.Value.ToString(CultureInfo.InvariantCulture);
             }
             }
 
 
-            audioTranscodeParams += " -vn";
             return audioTranscodeParams;
             return audioTranscodeParams;
         }
         }