Merge pull request #17537 from vdatanet/fix/pcm-wav-transcode

Fix PCM audio transcoding to wav returning HTTP 500 and headerless output

1 files changed, 40 insertions, 1 deletions

diff --git a/tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperTests.cs b/tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperTests.cs
index 71b6551d0f..2b009b4673 100644
--- a/tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperTests.cs
+++ b/tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperTests.cs
@@ -223,12 +223,51 @@ public class EncodingHelperTests
         Assert.Contains("-ar " + expectedSampleRate, args, StringComparison.Ordinal);
     }
 
-    private static EncodingJobInfo BuildAudioState(string audioCodec, int requestedSampleRate)
+    [Theory]
+    [InlineData("wav")]
+    [InlineData("flac")]
+    [InlineData("mp3")]
+    public void GetProgressiveAudioFullCommandLine_PcmInRealContainer_KeepsContainerMuxer(string outputContainer)
+    {
+        // A pcm_* encoder must not drag the raw muxer into a container that writes its own header,
+        // or the client gets headerless PCM behind the container's content type.
+        var state = BuildAudioState("pcm_s16le", 48000, outputContainer);
+        var args = CreateHelper().GetProgressiveAudioFullCommandLine(state, new EncodingOptions(), "/tmp/out");
+
+        Assert.DoesNotContain("-f s16le", args, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void GetProgressiveAudioFullCommandLine_PcmInPcmContainer_ForcesRawMuxer()
+    {
+        // The raw-PCM route added in #10321 for I2S/MCU clients must keep working.
+        var state = BuildAudioState("pcm_s16le", 48000, "pcm");
+        var args = CreateHelper().GetProgressiveAudioFullCommandLine(state, new EncodingOptions(), "/tmp/out");
+
+        Assert.Contains("-f s16le", args, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void GetProgressiveAudioFullCommandLine_PcmWithoutBitrate_EmitsNoEmptySampleRate()
+    {
+        // AudioBitRate is optional; it used to be emitted as `-ar <null>`, producing a bare `-ar`
+        // that made ffmpeg abort with "Expected number for ar" and the request fail with HTTP 500.
+        var state = BuildAudioState("pcm_s16le", 48000, "wav");
+        state.BaseRequest.AudioBitRate = null;
+        var args = CreateHelper().GetProgressiveAudioFullCommandLine(state, new EncodingOptions(), "/tmp/out");
+
+        Assert.DoesNotContain("-ar -", args, StringComparison.Ordinal);
+        Assert.DoesNotContain("-ar  ", args, StringComparison.Ordinal);
+        Assert.Contains("-ar 48000", args, StringComparison.Ordinal);
+    }
+
+    private static EncodingJobInfo BuildAudioState(string audioCodec, int requestedSampleRate, string? outputContainer = null)
     {
         var audio = new MediaStream { Index = 0, Type = MediaStreamType.Audio, Codec = "flac", SampleRate = 96000 };
 
         return new EncodingJobInfo(TranscodingJobType.Progressive)
         {
+            OutputContainer = outputContainer,
             MediaSource = new MediaSourceInfo
             {
                 Container = "flac",