From 6042f4809ecebbc28c5cf8e90bed4aa2c845381c Mon Sep 17 00:00:00 2001 From: gnattu Date: Fri, 20 Nov 2026 07:25:11 -0500 Subject: Backport pull request #18578 from jellyfin/release-12.z Fix audio gaps when restarting HLS with copied video Original-merge: 54e4dbb4fe35fa065c38a28fcc8835e50c395e7e Merged-by: Bond-009 Backported-by: Cody Robibero --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index ebfa78176a..f3382b2d51 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -3116,6 +3116,16 @@ namespace MediaBrowser.Controller.MediaEncoding } seekParam += string.Format(CultureInfo.InvariantCulture, "-ss {0}", _mediaEncoder.GetTimeParameter(seekTick)); + + // Retain audio from the preceding keyframe to match copied video's start time. + if (isHlsRemuxing + && state.AudioStream is not null + && !string.IsNullOrEmpty(state.OutputAudioCodec) + && !IsCopyCodec(state.OutputAudioCodec) + && !string.Equals(state.InputContainer, "wtv", StringComparison.OrdinalIgnoreCase)) + { + seekParam += " -noaccurate_seek"; + } } return seekParam; -- cgit v1.2.3