2 files changed, 30 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 1b0bbe9ea0..9a68889352 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -7864,10 +7864,16 @@ namespace MediaBrowser.Controller.MediaEncoding
                 audioTranscodeParams.Add("-acodec " + GetAudioEncoder(state));
             }
 
-            if (GetAudioEncoder(state).StartsWith("pcm_", StringComparison.Ordinal))
-            {
-                audioTranscodeParams.Add(string.Concat("-f ", GetAudioEncoder(state).AsSpan(4)));
-                audioTranscodeParams.Add("-ar " + state.BaseRequest.AudioBitRate);
+            // The pcm_* encoders emit raw samples that carry no header of their own, so the header
+            // has to come from the muxer. Only force the matching raw muxer when the client actually
+            // asked for a raw container (added in #10321 for I2S/MCU clients): applying it to every
+            // pcm_* codec also strips the RIFF header from a `stream.wav` request, which then serves
+            // headerless PCM behind an audio/wav content type.
+            var audioEncoder = GetAudioEncoder(state);
+            if (audioEncoder.StartsWith("pcm_", StringComparison.Ordinal)
+                && string.Equals(state.OutputContainer, "pcm", StringComparison.OrdinalIgnoreCase))
+            {
+                audioTranscodeParams.Add(string.Concat("-f ", audioEncoder.AsSpan(4)));
             }
 
             var sampleRate = state.OutputAudioSampleRate;
diff --git a/MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs b/MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs
index 56990d0b82..5045030b9b 100644
--- a/MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs
+++ b/MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs
@@ -15,6 +15,7 @@ public sealed class TranscodingJob : IDisposable
     private readonly Lock _processLock = new();
     private readonly Lock _timerLock = new();
 
+    private int _activeRequestCount;
     private Timer? _killTimer;
 
     /// <summary>
@@ -64,7 +65,11 @@ public sealed class TranscodingJob : IDisposable
     /// <summary>
     /// Gets or sets the active request count.
     /// </summary>
-    public int ActiveRequestCount { get; set; }
+    public int ActiveRequestCount
+    {
+        get => Volatile.Read(ref _activeRequestCount);
+        set => Volatile.Write(ref _activeRequestCount, value);
+    }
 
     /// <summary>
     /// Gets or sets device id.
@@ -152,6 +157,20 @@ public sealed class TranscodingJob : IDisposable
     public int PingTimeout { get; set; }
 
     /// <summary>
+    /// Increments the active request count.
+    /// </summary>
+    /// <returns>The incremented count.</returns>
+    public int IncrementActiveRequestCount()
+        => Interlocked.Increment(ref _activeRequestCount);
+
+    /// <summary>
+    /// Decrements the active request count.
+    /// </summary>
+    /// <returns>The decremented count.</returns>
+    public int DecrementActiveRequestCount()
+        => Interlocked.Decrement(ref _activeRequestCount);
+
+    /// <summary>
     /// Stop kill timer.
     /// </summary>
     public void StopKillTimer()