From 8d544e48424d9ddbb1f97d354ed6e6a3f749cbfb Mon Sep 17 00:00:00 2001
From: Piotr Niełacny <piotr.nielacny@gmail.com>
Date: Thu, 28 May 2026 19:26:28 +0200
Subject: Fix A/V desync when resuming HLS with video transcode + audio copy
 (#16580)

Fix A/V desync when resuming HLS with video transcode + audio copy
---
 .../EncodingHelperAudioBitStreamTests.cs           | 99 ++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperAudioBitStreamTests.cs

(limited to 'tests')

diff --git a/tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperAudioBitStreamTests.cs b/tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperAudioBitStreamTests.cs
new file mode 100644
index 0000000000..2dcb898051
--- /dev/null
+++ b/tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperAudioBitStreamTests.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Globalization;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Entities;
+using Microsoft.Extensions.Configuration;
+using Moq;
+using Xunit;
+using IConfigurationManager = MediaBrowser.Common.Configuration.IConfigurationManager;
+
+namespace Jellyfin.Controller.Tests.MediaEncoding
+{
+    public class EncodingHelperAudioBitStreamTests
+    {
+        private const string BothFilters = " -bsf:a noise=drop='lt(pts*tb\\,63.063)',aac_adtstoasc";
+        private const string NoiseOnly = " -bsf:a noise=drop='lt(pts*tb\\,63.063)'";
+        private const string AdtsOnly = " -bsf:a aac_adtstoasc";
+        private const long DefaultSeekTicks = 630_630_000L;
+        private const string DefaultFfmpegVersion = "5.0";
+
+        private static EncodingHelper CreateHelper(string ffmpegVersion)
+        {
+            var mediaEncoder = new Mock<IMediaEncoder>();
+            mediaEncoder
+                .Setup(e => e.GetTimeParameter(It.IsAny<long>()))
+                .Returns((long ticks) => TimeSpan.FromTicks(ticks).ToString(@"hh\:mm\:ss\.fff", CultureInfo.InvariantCulture));
+            mediaEncoder
+                .SetupGet(e => e.EncoderVersion)
+                .Returns(Version.Parse(ffmpegVersion));
+
+            return new EncodingHelper(
+                Mock.Of<IApplicationPaths>(),
+                mediaEncoder.Object,
+                Mock.Of<ISubtitleEncoder>(),
+                Mock.Of<IConfiguration>(),
+                Mock.Of<IConfigurationManager>(),
+                Mock.Of<IPathManager>());
+        }
+
+        private static EncodingJobInfo CreateState(
+            TranscodingJobType jobType,
+            string outputVideoCodec,
+            string outputAudioCodec,
+            string audioStreamCodec,
+            string inputContainer,
+            long startTimeTicks)
+        {
+            return new EncodingJobInfo(jobType)
+            {
+                IsVideoRequest = true,
+                OutputVideoCodec = outputVideoCodec,
+                OutputAudioCodec = outputAudioCodec,
+                InputContainer = inputContainer,
+                RunTimeTicks = TimeSpan.FromMinutes(10).Ticks,
+                AudioStream = new MediaStream
+                {
+                    Type = MediaStreamType.Audio,
+                    Codec = audioStreamCodec
+                },
+                BaseRequest = new BaseEncodingJobOptions
+                {
+                    StartTimeTicks = startTimeTicks
+                }
+            };
+        }
+
+        [Theory]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "aac", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "ts", BothFilters)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "aac", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "aac", BothFilters)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "aac", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "hls", BothFilters)]
+        [InlineData(TranscodingJobType.Progressive, "libx264", "copy", "aac", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "ts", AdtsOnly)]
+        [InlineData(TranscodingJobType.Hls, "copy", "copy", "aac", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "ts", AdtsOnly)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "aac", "aac", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "ts", AdtsOnly)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "aac", "wtv", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "ts", AdtsOnly)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "aac", "ts", 0L, DefaultFfmpegVersion, "mp4", "ts", AdtsOnly)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "aac", "ts", DefaultSeekTicks, "4.4.6", "mp4", "ts", AdtsOnly)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "aac", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "ts", "ts", NoiseOnly)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "aac", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "mkv", NoiseOnly)]
+        [InlineData(TranscodingJobType.Hls, "libx264", "copy", "ac3", "ts", DefaultSeekTicks, DefaultFfmpegVersion, "mp4", "ts", NoiseOnly)]
+        public void AudioBitStreamArguments_AppliesGates(
+            TranscodingJobType jobType,
+            string outputVideoCodec,
+            string outputAudioCodec,
+            string audioStreamCodec,
+            string inputContainer,
+            long startTicks,
+            string ffmpegVersion,
+            string segmentContainer,
+            string mediaSourceContainer,
+            string expected)
+        {
+            var state = CreateState(jobType, outputVideoCodec, outputAudioCodec, audioStreamCodec, inputContainer, startTicks);
+            var result = CreateHelper(ffmpegVersion).GetAudioBitStreamArguments(state, segmentContainer, mediaSourceContainer);
+            Assert.Equal(expected, result);
+        }
+    }
+}
-- 
cgit v1.2.3