aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorgnattu <gnattu@users.noreply.github.com>2026-11-20 07:25:11 -0500
committerCody Robibero <cody@robibe.ro>2026-11-20 07:25:11 -0500
commit6042f4809ecebbc28c5cf8e90bed4aa2c845381c (patch)
tree00b0f806efe2a171327e4ffcec7d929968c854ef /MediaBrowser.Controller
parent791ec9f8dc2bccac58a09d17ec5cda512c38bed3 (diff)
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 <bond.009@outlook.com> Backported-by: Cody Robibero <cody@robibe.ro>
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs10
1 files changed, 10 insertions, 0 deletions
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;