From e627c723e29804e8f6f682bb61032908961f8699 Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Sat, 23 May 2026 22:41:44 +0200
Subject: Extract attachments in one ffmpeg command when dumping

---
 .../Attachments/AttachmentExtractor.cs             | 147 ++++++++++++++++++++-
 1 file changed, 140 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
index d9cb7a450f..9dd3dcecba 100644
--- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
+++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
@@ -1,8 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using AsyncKeyedLock;
@@ -102,13 +104,10 @@ namespace MediaBrowser.MediaEncoding.Attachments
                                                                               && (a.FileName.Contains('/', StringComparison.OrdinalIgnoreCase) || a.FileName.Contains('\\', StringComparison.OrdinalIgnoreCase)));
             if (shouldExtractOneByOne && !inputFile.EndsWith(".mks", StringComparison.OrdinalIgnoreCase))
             {
-                foreach (var attachment in mediaSource.MediaAttachments)
-                {
-                    if (!string.Equals(attachment.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase))
-                    {
-                        await ExtractAttachment(inputFile, mediaSource, attachment, cancellationToken).ConfigureAwait(false);
-                    }
-                }
+                await ExtractAllAttachmentsIndividuallyInternal(
+                    inputFile,
+                    mediaSource,
+                    cancellationToken).ConfigureAwait(false);
             }
             else
             {
@@ -119,6 +118,140 @@ namespace MediaBrowser.MediaEncoding.Attachments
             }
         }
 
+        private async Task ExtractAllAttachmentsIndividuallyInternal(
+            string inputFile,
+            MediaSourceInfo mediaSource,
+            CancellationToken cancellationToken)
+        {
+            var inputPath = _mediaEncoder.GetInputArgument(inputFile, mediaSource);
+
+            ArgumentException.ThrowIfNullOrEmpty(inputPath);
+
+            var outputFolder = _pathManager.GetAttachmentFolderPath(mediaSource.Id);
+            if (outputFolder is null)
+            {
+                _logger.LogDebug("Skipping attachment extraction for input {InputFile}: MediaSource Id is not a GUID.", inputFile);
+                return;
+            }
+
+            using (await _semaphoreLocks.LockAsync(outputFolder, cancellationToken).ConfigureAwait(false))
+            {
+                Directory.CreateDirectory(outputFolder);
+
+                var dumpArgs = new StringBuilder();
+                var missingPaths = new List<string>();
+                foreach (var attachment in mediaSource.MediaAttachments)
+                {
+                    if (string.Equals(attachment.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase))
+                    {
+                        continue;
+                    }
+
+                    var indexName = attachment.Index.ToString(CultureInfo.InvariantCulture);
+                    var attachmentPath = _pathManager.GetAttachmentPath(mediaSource.Id, attachment.FileName ?? indexName)
+                                         ?? _pathManager.GetAttachmentPath(mediaSource.Id, indexName)!;
+                    if (File.Exists(attachmentPath))
+                    {
+                        continue;
+                    }
+
+                    dumpArgs.AppendFormat(
+                        CultureInfo.InvariantCulture,
+                        "-dump_attachment:{0} \"{1}\" ",
+                        attachment.Index,
+                        EncodingUtils.NormalizePath(attachmentPath));
+                    missingPaths.Add(attachmentPath);
+                }
+
+                if (missingPaths.Count == 0)
+                {
+                    // Skip extraction if all files already exist
+                    return;
+                }
+
+                var hasVideoOrAudioStream = mediaSource.MediaStreams
+                    .Any(s => s.Type == MediaStreamType.Video || s.Type == MediaStreamType.Audio);
+                var processArgs = string.Format(
+                    CultureInfo.InvariantCulture,
+                    "{0}{1} -i {2} {3}",
+                    dumpArgs,
+                    inputPath.EndsWith(".concat\"", StringComparison.OrdinalIgnoreCase) ? "-f concat -safe 0" : string.Empty,
+                    inputPath,
+                    hasVideoOrAudioStream ? "-t 0 -f null null" : string.Empty);
+
+                int exitCode;
+
+                using (var process = new Process
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        Arguments = processArgs,
+                        FileName = _mediaEncoder.EncoderPath,
+                        UseShellExecute = false,
+                        CreateNoWindow = true,
+                        WindowStyle = ProcessWindowStyle.Hidden,
+                        ErrorDialog = false
+                    },
+                    EnableRaisingEvents = true
+                })
+                {
+                    _logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments);
+
+                    process.Start();
+
+                    try
+                    {
+                        await process.WaitForExitAsync(cancellationToken).ConfigureAwait(false);
+                        exitCode = process.ExitCode;
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        process.Kill(true);
+                        exitCode = -1;
+                    }
+                }
+
+                var failed = false;
+
+                if (exitCode != 0 && (hasVideoOrAudioStream || exitCode != 1))
+                {
+                    failed = true;
+
+                    foreach (var path in missingPaths)
+                    {
+                        if (!File.Exists(path))
+                        {
+                            continue;
+                        }
+
+                        try
+                        {
+                            _fileSystem.DeleteFile(path);
+                        }
+                        catch (IOException ex)
+                        {
+                            _logger.LogError(ex, "Error deleting extracted attachment {Path}", path);
+                        }
+                    }
+                }
+
+                if (!failed && missingPaths.Exists(p => !File.Exists(p)))
+                {
+                    failed = true;
+                }
+
+                if (failed)
+                {
+                    _logger.LogError("ffmpeg attachment extraction failed for {InputPath} to {OutputPath}", inputPath, outputFolder);
+
+                    throw new InvalidOperationException(
+                        string.Format(CultureInfo.InvariantCulture, "ffmpeg attachment extraction failed for {0} to {1}", inputPath, outputFolder));
+                }
+
+                _logger.LogInformation("ffmpeg attachment extraction completed for {InputPath} to {OutputPath}", inputPath, outputFolder);
+            }
+        }
+
         private async Task ExtractAllAttachmentsInternal(
             string inputFile,
             MediaSourceInfo mediaSource,
-- 
cgit v1.2.3


From 941298ee8108d79bd2f9bc010415103fddf54b0e Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 8 May 2026 21:29:13 +0200
Subject: Write subtitles using SubtitleEdit

We've been using SubtitleEdit to parse since 2021
https://github.com/jellyfin/jellyfin/pull/4984

I think it's time we start using it to write too
---
 MediaBrowser.MediaEncoding/Subtitles/AssWriter.cs  |  57 -----
 .../Subtitles/ISubtitleWriter.cs                   |  20 --
 MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs |  44 ----
 MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs  |  49 ----
 MediaBrowser.MediaEncoding/Subtitles/SsaWriter.cs  |  57 -----
 .../Subtitles/SubtitleEncoder.cs                   |  65 ++---
 MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs |  60 -----
 MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs  |  53 ----
 .../Subtitles/FilterEventsTests.cs                 | 282 ---------------------
 9 files changed, 35 insertions(+), 652 deletions(-)
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/AssWriter.cs
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/SsaWriter.cs
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
 delete mode 100644 tests/Jellyfin.MediaEncoding.Tests/Subtitles/FilterEventsTests.cs

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/AssWriter.cs
deleted file mode 100644
index 7d7b80e99d..0000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/AssWriter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using MediaBrowser.Model.MediaInfo;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// ASS subtitle writer.
-    /// </summary>
-    public partial class AssWriter : ISubtitleWriter
-    {
-        [GeneratedRegex(@"\n", RegexOptions.IgnoreCase)]
-        private static partial Regex NewLineRegex();
-
-        /// <inheritdoc />
-        public void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken)
-        {
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-            {
-                var trackEvents = info.TrackEvents;
-                var timeFormat = @"hh\:mm\:ss\.ff";
-
-                // Write ASS header
-                writer.WriteLine("[Script Info]");
-                writer.WriteLine("Title: Jellyfin transcoded ASS subtitle");
-                writer.WriteLine("ScriptType: v4.00+");
-                writer.WriteLine();
-                writer.WriteLine("[V4+ Styles]");
-                writer.WriteLine("Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding");
-                writer.WriteLine("Style: Default,Arial,20,&H00FFFFFF,&H00FFFFFF,&H19333333,&H910E0807,0,0,0,0,100,100,0,0,0,1,0,2,10,10,10,1");
-                writer.WriteLine();
-                writer.WriteLine("[Events]");
-                writer.WriteLine("Format: Layer, Start, End, Style, Text");
-
-                for (int i = 0; i < trackEvents.Count; i++)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    var trackEvent = trackEvents[i];
-                    var startTime = TimeSpan.FromTicks(trackEvent.StartPositionTicks).ToString(timeFormat, CultureInfo.InvariantCulture);
-                    var endTime = TimeSpan.FromTicks(trackEvent.EndPositionTicks).ToString(timeFormat, CultureInfo.InvariantCulture);
-                    var text = NewLineRegex().Replace(trackEvent.Text, "\\n");
-
-                    writer.WriteLine(
-                        "Dialogue: 0,{0},{1},Default,{2}",
-                        startTime,
-                        endTime,
-                        text);
-                }
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
deleted file mode 100644
index dec714121d..0000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.IO;
-using System.Threading;
-using MediaBrowser.Model.MediaInfo;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// Interface ISubtitleWriter.
-    /// </summary>
-    public interface ISubtitleWriter
-    {
-        /// <summary>
-        /// Writes the specified information.
-        /// </summary>
-        /// <param name="info">The information.</param>
-        /// <param name="stream">The stream.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken);
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
deleted file mode 100644
index 1b452b0cec..0000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.IO;
-using System.Text.Json;
-using System.Threading;
-using MediaBrowser.Model.MediaInfo;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// JSON subtitle writer.
-    /// </summary>
-    public class JsonWriter : ISubtitleWriter
-    {
-        /// <inheritdoc />
-        public void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken)
-        {
-            using (var writer = new Utf8JsonWriter(stream))
-            {
-                var trackevents = info.TrackEvents;
-                writer.WriteStartObject();
-                writer.WriteStartArray("TrackEvents");
-
-                for (int i = 0; i < trackevents.Count; i++)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    var current = trackevents[i];
-                    writer.WriteStartObject();
-
-                    writer.WriteString("Id", current.Id);
-                    writer.WriteString("Text", current.Text);
-                    writer.WriteNumber("StartPositionTicks", current.StartPositionTicks);
-                    writer.WriteNumber("EndPositionTicks", current.EndPositionTicks);
-
-                    writer.WriteEndObject();
-                }
-
-                writer.WriteEndArray();
-                writer.WriteEndObject();
-
-                writer.Flush();
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
deleted file mode 100644
index 86f77aa067..0000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using MediaBrowser.Model.MediaInfo;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// SRT subtitle writer.
-    /// </summary>
-    public partial class SrtWriter : ISubtitleWriter
-    {
-        [GeneratedRegex(@"\\n", RegexOptions.IgnoreCase)]
-        private static partial Regex NewLineEscapedRegex();
-
-        /// <inheritdoc />
-        public void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken)
-        {
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-            {
-                var trackEvents = info.TrackEvents;
-
-                for (int i = 0; i < trackEvents.Count; i++)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    var trackEvent = trackEvents[i];
-
-                    writer.WriteLine((i + 1).ToString(CultureInfo.InvariantCulture));
-                    writer.WriteLine(
-                        @"{0:hh\:mm\:ss\,fff} --> {1:hh\:mm\:ss\,fff}",
-                        TimeSpan.FromTicks(trackEvent.StartPositionTicks),
-                        TimeSpan.FromTicks(trackEvent.EndPositionTicks));
-
-                    var text = trackEvent.Text;
-
-                    // TODO: Not sure how to handle these
-                    text = NewLineEscapedRegex().Replace(text, " ");
-
-                    writer.WriteLine(text);
-                    writer.WriteLine();
-                }
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaWriter.cs
deleted file mode 100644
index b5fd1ed935..0000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaWriter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using MediaBrowser.Model.MediaInfo;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// SSA subtitle writer.
-    /// </summary>
-    public partial class SsaWriter : ISubtitleWriter
-    {
-        [GeneratedRegex(@"\n", RegexOptions.IgnoreCase)]
-        private static partial Regex NewLineRegex();
-
-        /// <inheritdoc />
-        public void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken)
-        {
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-            {
-                var trackEvents = info.TrackEvents;
-                var timeFormat = @"hh\:mm\:ss\.ff";
-
-                // Write SSA header
-                writer.WriteLine("[Script Info]");
-                writer.WriteLine("Title: Jellyfin transcoded SSA subtitle");
-                writer.WriteLine("ScriptType: v4.00");
-                writer.WriteLine();
-                writer.WriteLine("[V4 Styles]");
-                writer.WriteLine("Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding");
-                writer.WriteLine("Style: Default,Arial,20,&H00FFFFFF,&H00FFFFFF,&H19333333,&H19333333,0,0,0,1,0,2,10,10,10,0,1");
-                writer.WriteLine();
-                writer.WriteLine("[Events]");
-                writer.WriteLine("Format: Layer, Start, End, Style, Text");
-
-                for (int i = 0; i < trackEvents.Count; i++)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    var trackEvent = trackEvents[i];
-                    var startTime = TimeSpan.FromTicks(trackEvent.StartPositionTicks).ToString(timeFormat, CultureInfo.InvariantCulture);
-                    var endTime = TimeSpan.FromTicks(trackEvent.EndPositionTicks).ToString(timeFormat, CultureInfo.InvariantCulture);
-                    var text = NewLineRegex().Replace(trackEvent.Text, "\\n");
-
-                    writer.WriteLine(
-                        "Dialogue: 0,{0},{1},Default,{2}",
-                        startTime,
-                        endTime,
-                        text);
-                }
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index e0c5f3ad39..2dc71d08c4 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -26,7 +26,10 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
 using Microsoft.Extensions.Logging;
+using Nikse.SubtitleEdit.Core.Common;
+using Nikse.SubtitleEdit.Core.SubtitleFormats;
 using UtfUnknown;
+using SubtitleFormat = MediaBrowser.Model.MediaInfo.SubtitleFormat;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
@@ -72,7 +75,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         private MemoryStream ConvertSubtitles(
             Stream stream,
-            string inputFormat,
+            SubtitleInfo inputInfo,
             string outputFormat,
             long startTimeTicks,
             long endTimeTicks,
@@ -83,13 +86,18 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             try
             {
-                var trackInfo = _subtitleParser.Parse(stream, inputFormat);
+                var subtitle = Subtitle.Parse(stream, Path.GetExtension(inputInfo.Path));
 
-                FilterEvents(trackInfo, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
+                FilterEvents(subtitle, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
 
-                var writer = GetWriter(outputFormat);
+                var formatter = GetWriter(outputFormat);
+
+                var text = formatter.ToText(subtitle, "untitled");
+                using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                {
+                    writer.Write(text);
+                }
 
-                writer.Write(trackInfo, ms, cancellationToken);
                 ms.Position = 0;
             }
             catch
@@ -101,26 +109,24 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return ms;
         }
 
-        internal void FilterEvents(SubtitleTrackInfo track, long startPositionTicks, long endTimeTicks, bool preserveTimestamps)
+        internal void FilterEvents(Subtitle track, long startPositionTicks, long endTimeTicks, bool preserveTimestamps)
         {
             // Drop subs that have fully elapsed before the requested start position
-            track.TrackEvents = track.TrackEvents
-                .SkipWhile(i => (i.StartPositionTicks - startPositionTicks) < 0 && (i.EndPositionTicks - startPositionTicks) < 0)
-                .ToArray();
+            track.Paragraphs
+                .RemoveAll(i => (i.StartTime.TimeSpan.Ticks - startPositionTicks) < 0 && (i.EndTime.TimeSpan.Ticks - startPositionTicks) < 0);
 
             if (endTimeTicks > 0)
             {
-                track.TrackEvents = track.TrackEvents
-                    .TakeWhile(i => i.StartPositionTicks <= endTimeTicks)
-                    .ToArray();
+                track.Paragraphs
+                    .RemoveAll(i => i.StartTime.TimeSpan.Ticks > endTimeTicks);
             }
 
             if (!preserveTimestamps)
             {
-                foreach (var trackEvent in track.TrackEvents)
+                foreach (var trackEvent in track.Paragraphs)
                 {
-                    trackEvent.EndPositionTicks = Math.Max(0, trackEvent.EndPositionTicks - startPositionTicks);
-                    trackEvent.StartPositionTicks = Math.Max(0, trackEvent.StartPositionTicks - startPositionTicks);
+                    trackEvent.StartTime = new TimeCode(TimeSpan.FromTicks(Math.Max(0, trackEvent.StartTime.TimeSpan.Ticks - startPositionTicks)));
+                    trackEvent.EndTime = new TimeCode(TimeSpan.FromTicks(Math.Max(0, trackEvent.EndTime.TimeSpan.Ticks - startPositionTicks)));
                 }
             }
         }
@@ -142,14 +148,14 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             var subtitleStream = mediaSource.MediaStreams
                .First(i => i.Type == MediaStreamType.Subtitle && i.Index == subtitleStreamIndex);
 
-            var (stream, inputFormat) = await GetSubtitleStream(mediaSource, subtitleStream, cancellationToken)
+            var (stream, info) = await GetSubtitleStream(mediaSource, subtitleStream, cancellationToken)
                         .ConfigureAwait(false);
 
             // Return the original if the same format is being requested
             // Character encoding was already handled in GetSubtitleStream
             // ASS is a superset of SSA, skipping the conversion and preserving the styles
-            if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase)
-                || (string.Equals(inputFormat, SubtitleFormat.SSA, StringComparison.OrdinalIgnoreCase)
+            if (string.Equals(info.Format, outputFormat, StringComparison.OrdinalIgnoreCase)
+                || (string.Equals(info.Format, SubtitleFormat.SSA, StringComparison.OrdinalIgnoreCase)
                     && string.Equals(outputFormat, SubtitleFormat.ASS, StringComparison.OrdinalIgnoreCase)))
             {
                 return stream;
@@ -157,11 +163,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             using (stream)
             {
-                return ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
+                return ConvertSubtitles(stream, info, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
             }
         }
 
-        private async Task<(Stream Stream, string Format)> GetSubtitleStream(
+        private async Task<(Stream Stream, SubtitleInfo Info)> GetSubtitleStream(
             MediaSourceInfo mediaSource,
             MediaStream subtitleStream,
             CancellationToken cancellationToken)
@@ -170,7 +176,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             var stream = await GetSubtitleStream(fileInfo, cancellationToken).ConfigureAwait(false);
 
-            return (stream, fileInfo.Format);
+            return (stream, fileInfo);
         }
 
         private async Task<Stream> GetSubtitleStream(SubtitleInfo fileInfo, CancellationToken cancellationToken)
@@ -267,43 +273,42 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             };
         }
 
-        private bool TryGetWriter(string format, [NotNullWhen(true)] out ISubtitleWriter? value)
+        private bool TryGetWriter(string format, [NotNullWhen(true)] out Nikse.SubtitleEdit.Core.SubtitleFormats.SubtitleFormat? value)
         {
             ArgumentException.ThrowIfNullOrEmpty(format);
 
             if (string.Equals(format, SubtitleFormat.ASS, StringComparison.OrdinalIgnoreCase))
             {
-                value = new AssWriter();
+                value = new AdvancedSubStationAlpha();
                 return true;
             }
 
             if (string.Equals(format, "json", StringComparison.OrdinalIgnoreCase))
             {
-                value = new JsonWriter();
-                return true;
+                throw new NotImplementedException();
             }
 
             if (string.Equals(format, SubtitleFormat.SRT, StringComparison.OrdinalIgnoreCase) || string.Equals(format, SubtitleFormat.SUBRIP, StringComparison.OrdinalIgnoreCase))
             {
-                value = new SrtWriter();
+                value = new SubRip();
                 return true;
             }
 
             if (string.Equals(format, SubtitleFormat.SSA, StringComparison.OrdinalIgnoreCase))
             {
-                value = new SsaWriter();
+                value = new SubStationAlpha();
                 return true;
             }
 
             if (string.Equals(format, SubtitleFormat.VTT, StringComparison.OrdinalIgnoreCase) || string.Equals(format, SubtitleFormat.WEBVTT, StringComparison.OrdinalIgnoreCase))
             {
-                value = new VttWriter();
+                value = new WebVTT();
                 return true;
             }
 
             if (string.Equals(format, SubtitleFormat.TTML, StringComparison.OrdinalIgnoreCase))
             {
-                value = new TtmlWriter();
+                value = new TimedText10();
                 return true;
             }
 
@@ -311,7 +316,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return false;
         }
 
-        private ISubtitleWriter GetWriter(string format)
+        private Nikse.SubtitleEdit.Core.SubtitleFormats.SubtitleFormat GetWriter(string format)
         {
             if (TryGetWriter(format, out var writer))
             {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
deleted file mode 100644
index ea45f2070a..0000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using MediaBrowser.Model.MediaInfo;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// TTML subtitle writer.
-    /// </summary>
-    public partial class TtmlWriter : ISubtitleWriter
-    {
-        [GeneratedRegex(@"\\n", RegexOptions.IgnoreCase)]
-        private static partial Regex NewLineEscapeRegex();
-
-        /// <inheritdoc />
-        public void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken)
-        {
-            // Example: https://github.com/zmalltalker/ttml2vtt/blob/master/data/sample.xml
-            // Parser example: https://github.com/mozilla/popcorn-js/blob/master/parsers/parserTTML/popcorn.parserTTML.js
-
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-            {
-                writer.WriteLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
-                writer.WriteLine("<tt xmlns=\"http://www.w3.org/ns/ttml\" xmlns:tts=\"http://www.w3.org/2006/04/ttaf1#styling\" lang=\"no\">");
-
-                writer.WriteLine("<head>");
-                writer.WriteLine("<styling>");
-                writer.WriteLine("<style id=\"italic\" tts:fontStyle=\"italic\" />");
-                writer.WriteLine("<style id=\"left\" tts:textAlign=\"left\" />");
-                writer.WriteLine("<style id=\"center\" tts:textAlign=\"center\" />");
-                writer.WriteLine("<style id=\"right\" tts:textAlign=\"right\" />");
-                writer.WriteLine("</styling>");
-                writer.WriteLine("</head>");
-
-                writer.WriteLine("<body>");
-                writer.WriteLine("<div>");
-
-                foreach (var trackEvent in info.TrackEvents)
-                {
-                    var text = trackEvent.Text;
-
-                    text = NewLineEscapeRegex().Replace(text, "<br/>");
-
-                    writer.WriteLine(
-                        "<p begin=\"{0}\" dur=\"{1}\">{2}</p>",
-                        trackEvent.StartPositionTicks,
-                        trackEvent.EndPositionTicks - trackEvent.StartPositionTicks,
-                        text);
-                }
-
-                writer.WriteLine("</div>");
-                writer.WriteLine("</body>");
-
-                writer.WriteLine("</tt>");
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
deleted file mode 100644
index 3e0f47b5ae..0000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using MediaBrowser.Model.MediaInfo;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    /// <summary>
-    /// Subtitle writer for the WebVTT format.
-    /// </summary>
-    public partial class VttWriter : ISubtitleWriter
-    {
-        [GeneratedRegex(@"\\n", RegexOptions.IgnoreCase)]
-        private static partial Regex NewlineEscapeRegex();
-
-        /// <inheritdoc />
-        public void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken)
-        {
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-            {
-                writer.WriteLine("WEBVTT");
-                writer.WriteLine();
-                writer.WriteLine("Region: id:subtitle width:80% lines:3 regionanchor:50%,100% viewportanchor:50%,90%");
-                writer.WriteLine();
-                foreach (var trackEvent in info.TrackEvents)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    var startTime = TimeSpan.FromTicks(trackEvent.StartPositionTicks);
-                    var endTime = TimeSpan.FromTicks(trackEvent.EndPositionTicks);
-
-                    // make sure the start and end times are different and sequential
-                    if (endTime.TotalMilliseconds <= startTime.TotalMilliseconds)
-                    {
-                        endTime = startTime.Add(TimeSpan.FromMilliseconds(1));
-                    }
-
-                    writer.WriteLine(@"{0:hh\:mm\:ss\.fff} --> {1:hh\:mm\:ss\.fff} region:subtitle line:90%", startTime, endTime);
-
-                    var text = trackEvent.Text;
-
-                    // TODO: Not sure how to handle these
-                    text = NewlineEscapeRegex().Replace(text, " ");
-
-                    writer.WriteLine(text);
-                    writer.WriteLine();
-                }
-            }
-        }
-    }
-}
diff --git a/tests/Jellyfin.MediaEncoding.Tests/Subtitles/FilterEventsTests.cs b/tests/Jellyfin.MediaEncoding.Tests/Subtitles/FilterEventsTests.cs
deleted file mode 100644
index 5f84e85592..0000000000
--- a/tests/Jellyfin.MediaEncoding.Tests/Subtitles/FilterEventsTests.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-using System;
-using AutoFixture;
-using AutoFixture.AutoMoq;
-using MediaBrowser.MediaEncoding.Subtitles;
-using MediaBrowser.Model.MediaInfo;
-using Xunit;
-
-namespace Jellyfin.MediaEncoding.Subtitles.Tests
-{
-    public class FilterEventsTests
-    {
-        private readonly SubtitleEncoder _encoder;
-
-        public FilterEventsTests()
-        {
-            var fixture = new Fixture().Customize(new AutoMoqCustomization { ConfigureMembers = true });
-            _encoder = fixture.Create<SubtitleEncoder>();
-        }
-
-        [Fact]
-        public void FilterEvents_SubtitleSpanningSegmentBoundary_IsRetained()
-        {
-            // Subtitle starts at 5s, ends at 15s.
-            // Segment requested from 10s to 20s.
-            // The subtitle is still on screen at 10s and should NOT be dropped.
-            var track = new SubtitleTrackInfo
-            {
-                TrackEvents = new[]
-                {
-                    new SubtitleTrackEvent("1", "Still on screen")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(5).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(15).Ticks
-                    },
-                    new SubtitleTrackEvent("2", "Next subtitle")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(12).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(17).Ticks
-                    }
-                }
-            };
-
-            _encoder.FilterEvents(
-                track,
-                startPositionTicks: TimeSpan.FromSeconds(10).Ticks,
-                endTimeTicks: TimeSpan.FromSeconds(20).Ticks,
-                preserveTimestamps: true);
-
-            Assert.Equal(2, track.TrackEvents.Count);
-            Assert.Equal("1", track.TrackEvents[0].Id);
-            Assert.Equal("2", track.TrackEvents[1].Id);
-        }
-
-        [Fact]
-        public void FilterEvents_SubtitleFullyBeforeSegment_IsDropped()
-        {
-            // Subtitle starts at 2s, ends at 5s.
-            // Segment requested from 10s.
-            // The subtitle ended before the segment — should be dropped.
-            var track = new SubtitleTrackInfo
-            {
-                TrackEvents = new[]
-                {
-                    new SubtitleTrackEvent("1", "Already gone")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(2).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(5).Ticks
-                    },
-                    new SubtitleTrackEvent("2", "Visible")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(12).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(17).Ticks
-                    }
-                }
-            };
-
-            _encoder.FilterEvents(
-                track,
-                startPositionTicks: TimeSpan.FromSeconds(10).Ticks,
-                endTimeTicks: TimeSpan.FromSeconds(20).Ticks,
-                preserveTimestamps: true);
-
-            Assert.Single(track.TrackEvents);
-            Assert.Equal("2", track.TrackEvents[0].Id);
-        }
-
-        [Fact]
-        public void FilterEvents_SubtitleAfterSegment_IsDropped()
-        {
-            // Segment is 10s-20s, subtitle starts at 25s.
-            var track = new SubtitleTrackInfo
-            {
-                TrackEvents = new[]
-                {
-                    new SubtitleTrackEvent("1", "In range")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(12).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(15).Ticks
-                    },
-                    new SubtitleTrackEvent("2", "After segment")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(25).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(30).Ticks
-                    }
-                }
-            };
-
-            _encoder.FilterEvents(
-                track,
-                startPositionTicks: TimeSpan.FromSeconds(10).Ticks,
-                endTimeTicks: TimeSpan.FromSeconds(20).Ticks,
-                preserveTimestamps: true);
-
-            Assert.Single(track.TrackEvents);
-            Assert.Equal("1", track.TrackEvents[0].Id);
-        }
-
-        [Fact]
-        public void FilterEvents_PreserveTimestampsFalse_AdjustsTimestamps()
-        {
-            var track = new SubtitleTrackInfo
-            {
-                TrackEvents = new[]
-                {
-                    new SubtitleTrackEvent("1", "Subtitle")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(15).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(20).Ticks
-                    }
-                }
-            };
-
-            _encoder.FilterEvents(
-                track,
-                startPositionTicks: TimeSpan.FromSeconds(10).Ticks,
-                endTimeTicks: TimeSpan.FromSeconds(30).Ticks,
-                preserveTimestamps: false);
-
-            Assert.Single(track.TrackEvents);
-            // Timestamps should be shifted back by 10s
-            Assert.Equal(TimeSpan.FromSeconds(5).Ticks, track.TrackEvents[0].StartPositionTicks);
-            Assert.Equal(TimeSpan.FromSeconds(10).Ticks, track.TrackEvents[0].EndPositionTicks);
-        }
-
-        [Fact]
-        public void FilterEvents_PreserveTimestampsTrue_KeepsOriginalTimestamps()
-        {
-            var startTicks = TimeSpan.FromSeconds(15).Ticks;
-            var endTicks = TimeSpan.FromSeconds(20).Ticks;
-
-            var track = new SubtitleTrackInfo
-            {
-                TrackEvents = new[]
-                {
-                    new SubtitleTrackEvent("1", "Subtitle")
-                    {
-                        StartPositionTicks = startTicks,
-                        EndPositionTicks = endTicks
-                    }
-                }
-            };
-
-            _encoder.FilterEvents(
-                track,
-                startPositionTicks: TimeSpan.FromSeconds(10).Ticks,
-                endTimeTicks: TimeSpan.FromSeconds(30).Ticks,
-                preserveTimestamps: true);
-
-            Assert.Single(track.TrackEvents);
-            Assert.Equal(startTicks, track.TrackEvents[0].StartPositionTicks);
-            Assert.Equal(endTicks, track.TrackEvents[0].EndPositionTicks);
-        }
-
-        [Fact]
-        public void FilterEvents_SubtitleEndingExactlyAtSegmentStart_IsRetained()
-        {
-            // Subtitle ends exactly when the segment begins.
-            // EndPositionTicks == startPositionTicks means (end - start) == 0, not < 0,
-            // so SkipWhile stops and the subtitle is retained.
-            var track = new SubtitleTrackInfo
-            {
-                TrackEvents = new[]
-                {
-                    new SubtitleTrackEvent("1", "Boundary subtitle")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(5).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(10).Ticks
-                    },
-                    new SubtitleTrackEvent("2", "In range")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(12).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(15).Ticks
-                    }
-                }
-            };
-
-            _encoder.FilterEvents(
-                track,
-                startPositionTicks: TimeSpan.FromSeconds(10).Ticks,
-                endTimeTicks: TimeSpan.FromSeconds(20).Ticks,
-                preserveTimestamps: true);
-
-            Assert.Equal(2, track.TrackEvents.Count);
-            Assert.Equal("1", track.TrackEvents[0].Id);
-        }
-
-        [Fact]
-        public void FilterEvents_SpanningBoundaryWithTimestampAdjustment_DoesNotProduceNegativeTimestamps()
-        {
-            // Subtitle starts at 5s, ends at 15s.
-            // Segment requested from 10s to 20s, preserveTimestamps = false.
-            // The subtitle spans the boundary and is retained, but shifting
-            // StartPositionTicks by -10s would produce -5s (negative).
-            var track = new SubtitleTrackInfo
-            {
-                TrackEvents = new[]
-                {
-                    new SubtitleTrackEvent("1", "Spans boundary")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(5).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(15).Ticks
-                    },
-                    new SubtitleTrackEvent("2", "Fully in range")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(12).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(17).Ticks
-                    }
-                }
-            };
-
-            _encoder.FilterEvents(
-                track,
-                startPositionTicks: TimeSpan.FromSeconds(10).Ticks,
-                endTimeTicks: TimeSpan.FromSeconds(20).Ticks,
-                preserveTimestamps: false);
-
-            Assert.Equal(2, track.TrackEvents.Count);
-            // Subtitle 1: start should be clamped to 0, not -5s
-            Assert.True(track.TrackEvents[0].StartPositionTicks >= 0, "StartPositionTicks must not be negative");
-            Assert.Equal(TimeSpan.FromSeconds(5).Ticks, track.TrackEvents[0].EndPositionTicks);
-            // Subtitle 2: normal shift (12s - 10s = 2s, 17s - 10s = 7s)
-            Assert.Equal(TimeSpan.FromSeconds(2).Ticks, track.TrackEvents[1].StartPositionTicks);
-            Assert.Equal(TimeSpan.FromSeconds(7).Ticks, track.TrackEvents[1].EndPositionTicks);
-        }
-
-        [Fact]
-        public void FilterEvents_NoEndTimeTicks_ReturnsAllFromStartPosition()
-        {
-            var track = new SubtitleTrackInfo
-            {
-                TrackEvents = new[]
-                {
-                    new SubtitleTrackEvent("1", "Before")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(2).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(4).Ticks
-                    },
-                    new SubtitleTrackEvent("2", "After")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(12).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(15).Ticks
-                    },
-                    new SubtitleTrackEvent("3", "Much later")
-                    {
-                        StartPositionTicks = TimeSpan.FromSeconds(500).Ticks,
-                        EndPositionTicks = TimeSpan.FromSeconds(505).Ticks
-                    }
-                }
-            };
-
-            _encoder.FilterEvents(
-                track,
-                startPositionTicks: TimeSpan.FromSeconds(10).Ticks,
-                endTimeTicks: 0,
-                preserveTimestamps: true);
-
-            Assert.Equal(2, track.TrackEvents.Count);
-            Assert.Equal("2", track.TrackEvents[0].Id);
-            Assert.Equal("3", track.TrackEvents[1].Id);
-        }
-    }
-}
-- 
cgit v1.2.3


From 2b6da4481574cf67db6fd1325e08f59015884459 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sat, 30 May 2026 21:42:19 +0200
Subject: Clean up ConvertSubtitles

---
 .../Subtitles/SubtitleEncoder.cs                   | 32 ++++++----------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 2dc71d08c4..0192aa57f2 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -79,34 +79,18 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             string outputFormat,
             long startTimeTicks,
             long endTimeTicks,
-            bool preserveOriginalTimestamps,
-            CancellationToken cancellationToken)
+            bool preserveOriginalTimestamps)
         {
-            var ms = new MemoryStream();
-
-            try
-            {
-                var subtitle = Subtitle.Parse(stream, Path.GetExtension(inputInfo.Path));
-
-                FilterEvents(subtitle, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
+            var subtitle = Subtitle.Parse(stream, Path.GetExtension(inputInfo.Path));
 
-                var formatter = GetWriter(outputFormat);
+            FilterEvents(subtitle, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
 
-                var text = formatter.ToText(subtitle, "untitled");
-                using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                {
-                    writer.Write(text);
-                }
+            var formatter = GetWriter(outputFormat);
 
-                ms.Position = 0;
-            }
-            catch
-            {
-                ms.Dispose();
-                throw;
-            }
+            var text = formatter.ToText(subtitle, "untitled");
+            var bytes = Encoding.UTF8.GetBytes(text);
 
-            return ms;
+            return new MemoryStream(bytes, 0, bytes.Length, false, true);
         }
 
         internal void FilterEvents(Subtitle track, long startPositionTicks, long endTimeTicks, bool preserveTimestamps)
@@ -163,7 +147,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             using (stream)
             {
-                return ConvertSubtitles(stream, info, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
+                return ConvertSubtitles(stream, info, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
             }
         }
 
-- 
cgit v1.2.3


From 1dd02b0e30938ea4874da700aad048cc7ada637c Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sat, 30 May 2026 21:42:57 +0200
Subject: Add JsonWriter back

---
 MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs | 58 ++++++++++++++++++++++
 .../Subtitles/SubtitleEncoder.cs                   |  9 ++--
 2 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
new file mode 100644
index 0000000000..0e40181016
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using Nikse.SubtitleEdit.Core.Common;
+using Nikse.SubtitleEdit.Core.SubtitleFormats;
+
+namespace MediaBrowser.MediaEncoding.Subtitles;
+
+/// <summary>
+/// JSON subtitle writer.
+/// </summary>
+public class JsonWriter : SubtitleFormat
+{
+    /// <inheritdoc />
+    public override string Extension => ".json";
+
+    /// <inheritdoc />
+    public override string Name => "JSON Jellyfin";
+
+    /// <inheritdoc />
+    public override string ToText(Subtitle subtitle, string title)
+    {
+        using var ms = new MemoryStream();
+        using (var writer = new Utf8JsonWriter(ms))
+        {
+            var trackevents = subtitle.Paragraphs;
+            writer.WriteStartObject();
+            writer.WriteStartArray("TrackEvents");
+
+            for (int i = 0; i < trackevents.Count; i++)
+            {
+                var current = trackevents[i];
+                writer.WriteStartObject();
+
+                writer.WriteString("Id", current.Number.ToString(CultureInfo.InvariantCulture));
+                writer.WriteString("Text", current.Text);
+                writer.WriteNumber("StartPositionTicks", current.StartTime.TimeSpan.Ticks);
+                writer.WriteNumber("EndPositionTicks", current.EndTime.TimeSpan.Ticks);
+
+                writer.WriteEndObject();
+            }
+
+            writer.WriteEndArray();
+            writer.WriteEndObject();
+
+            writer.Flush();
+        }
+
+        return Encoding.UTF8.GetString(ms.GetBuffer(), 0, (int)ms.Length);
+    }
+
+    /// <inheritdoc />
+    public override void LoadSubtitle(Subtitle subtitle, List<string> lines, string fileName)
+        => throw new NotImplementedException();
+}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 0192aa57f2..e8bc0f1ffb 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -269,10 +269,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             if (string.Equals(format, "json", StringComparison.OrdinalIgnoreCase))
             {
-                throw new NotImplementedException();
+                value = new JsonWriter();
+                return true;
             }
 
-            if (string.Equals(format, SubtitleFormat.SRT, StringComparison.OrdinalIgnoreCase) || string.Equals(format, SubtitleFormat.SUBRIP, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(format, SubtitleFormat.SRT, StringComparison.OrdinalIgnoreCase)
+                || string.Equals(format, SubtitleFormat.SUBRIP, StringComparison.OrdinalIgnoreCase))
             {
                 value = new SubRip();
                 return true;
@@ -284,7 +286,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 return true;
             }
 
-            if (string.Equals(format, SubtitleFormat.VTT, StringComparison.OrdinalIgnoreCase) || string.Equals(format, SubtitleFormat.WEBVTT, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(format, SubtitleFormat.VTT, StringComparison.OrdinalIgnoreCase)
+                || string.Equals(format, SubtitleFormat.WEBVTT, StringComparison.OrdinalIgnoreCase))
             {
                 value = new WebVTT();
                 return true;
-- 
cgit v1.2.3


From 6f0ff89bdcc1961ec630f43f012528ab79022a9f Mon Sep 17 00:00:00 2001
From: Neptune <al@altqx.com>
Date: Sun, 31 May 2026 22:18:25 +0700
Subject: Add support for VobSub subtitle streams (#16552)

* Add support for VobSub subtitle streams

* update logic to determine separate extraction for VobSub subtitles

* simplify VobSub extraction logic and fix ffmpeg command

* Match `ExtractAllExtractableSubtitlesMKS` with `ExtractAllExtractableSubtitlesInternal` Matroska's VobSub option

* Add a comments clarify why MKS was used, and remove the redundant VobSub extension branch

* remove redundant VobSub format check

* fix type errors
---
 .../Library/MediaSourceManager.cs                  |  5 +++
 .../Subtitles/SubtitleEncoder.cs                   | 36 +++++++++++++++-------
 MediaBrowser.Model/Dlna/StreamBuilder.cs           | 18 +++++++++--
 MediaBrowser.Model/Entities/MediaStream.cs         | 30 +++++++++++++++++-
 4 files changed, 74 insertions(+), 15 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 66614c6725..0caf66555a 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -127,6 +127,11 @@ namespace Emby.Server.Implementations.Library
                 return true;
             }
 
+            if (stream.IsVobSubSubtitleStream)
+            {
+                return true;
+            }
+
             return false;
         }
 
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index e0c5f3ad39..8d237473a3 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -220,12 +220,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     Path = outputPath,
                     Protocol = MediaProtocol.File,
                     Format = outputFormat,
-                    IsExternal = false
+                    IsExternal = MediaStream.IsVobSubFormat(outputFormat)
                 };
             }
 
-            var currentFormat = subtitleStream.Codec ?? Path.GetExtension(subtitleStream.Path)
-                .TrimStart('.');
+            var currentFormat = subtitleStream.Codec ?? Path.GetExtension(subtitleStream.Path).TrimStart('.');
 
             // Handle PGS subtitles as raw streams for the client to render
             if (MediaStream.IsPgsFormat(currentFormat))
@@ -475,6 +474,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 return subtitleStream.Codec;
             }
+            else if (MediaStream.IsVobSubFormat(subtitleStream.Codec))
+            {
+                return "mks";
+            }
             else
             {
                 return "srt";
@@ -488,6 +491,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 return "sup";
             }
+            else if (MediaStream.IsVobSubFormat(subtitleStream.Codec))
+            {
+                // FFmpeg cannot mux VobSub subtitle streams back into the .idx/.sub pair, so we use .mks container instead.
+                return "mks";
+            }
             else
             {
                 return GetExtractableSubtitleFormat(subtitleStream);
@@ -500,7 +508,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 || string.Equals(codec, "ssa", StringComparison.OrdinalIgnoreCase)
                 || string.Equals(codec, "srt", StringComparison.OrdinalIgnoreCase)
                 || string.Equals(codec, "subrip", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(codec, "pgssub", StringComparison.OrdinalIgnoreCase);
+                || string.Equals(codec, "pgssub", StringComparison.OrdinalIgnoreCase)
+                || MediaStream.IsVobSubFormat(codec);
         }
 
         /// <inheritdoc />
@@ -516,7 +525,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
                 foreach (var subtitleStream in subtitleStreams)
                 {
-                    if (subtitleStream.IsExternal && !subtitleStream.Path.EndsWith(".mks", StringComparison.OrdinalIgnoreCase))
+                    if (subtitleStream.IsExternal
+                        && !subtitleStream.Path.EndsWith(".mks", StringComparison.OrdinalIgnoreCase))
                     {
                         continue;
                     }
@@ -603,6 +613,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     }
 
                     var outputCodec = IsCodecCopyable(subtitleStream.Codec) ? "copy" : "srt";
+                    // FFmpeg does not provide an .idx/.sub muxer, so VobSub streams must be written as MKS files.
+                    var outputFormatOption = MediaStream.IsVobSubFormat(subtitleStream.Codec) ? " -f matroska" : string.Empty;
                     var streamIndex = EncodingHelper.FindIndex(mediaSource.MediaStreams, subtitleStream);
 
                     if (streamIndex == -1)
@@ -616,9 +628,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     outputPaths.Add(outputPath);
                     args += string.Format(
                         CultureInfo.InvariantCulture,
-                        " -map 0:{0} -an -vn -c:s {1} -flush_packets 1 \"{2}\"",
+                        " -map 0:{0} -an -vn -c:s {1}{2} -flush_packets 1 \"{3}\"",
                         streamIndex,
                         outputCodec,
+                        outputFormatOption,
                         outputPath);
                 }
 
@@ -653,6 +666,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 }
 
                 var outputCodec = IsCodecCopyable(subtitleStream.Codec) ? "copy" : "srt";
+                // FFmpeg does not provide an .idx/.sub muxer, so VobSub streams must be written as MKS files.
+                var outputFormatOption = MediaStream.IsVobSubFormat(subtitleStream.Codec) ? " -f matroska" : string.Empty;
                 var streamIndex = EncodingHelper.FindIndex(mediaSource.MediaStreams, subtitleStream);
 
                 if (streamIndex == -1)
@@ -666,18 +681,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 outputPaths.Add(outputPath);
                 args += string.Format(
                     CultureInfo.InvariantCulture,
-                    " -map 0:{0} -an -vn -c:s {1} -flush_packets 1 \"{2}\"",
+                    " -map 0:{0} -an -vn -c:s {1}{2} -flush_packets 1 \"{3}\"",
                     streamIndex,
                     outputCodec,
+                    outputFormatOption,
                     outputPath);
             }
 
-            if (outputPaths.Count == 0)
+            if (outputPaths.Count > 0)
             {
-                return;
+                await ExtractSubtitlesForFile(inputPath, args, outputPaths, cancellationToken).ConfigureAwait(false);
             }
-
-            await ExtractSubtitlesForFile(inputPath, args, outputPaths, cancellationToken).ConfigureAwait(false);
         }
 
         private async Task ExtractSubtitlesForFile(
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 2ccd2a6c28..d875bbe8ed 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -575,7 +575,12 @@ namespace MediaBrowser.Model.Dlna
                 {
                     foreach (var profile in subtitleProfiles)
                     {
-                        if (profile.Method == SubtitleDeliveryMethod.External && string.Equals(profile.Format, stream.Codec, StringComparison.OrdinalIgnoreCase))
+                        if (profile.Method == SubtitleDeliveryMethod.External
+                            && (string.Equals(profile.Format, stream.Codec, StringComparison.OrdinalIgnoreCase)
+                                // FFmpeg cannot mux VobSub back into an .idx/.sub pair, so extracted VobSub streams are exposed as .mks.
+                                || (string.Equals(profile.Format, "mks", StringComparison.OrdinalIgnoreCase)
+                                    && stream.IsVobSubSubtitleStream
+                                    && (!stream.IsExternal || stream.Path.EndsWith(".mks", StringComparison.OrdinalIgnoreCase)))))
                         {
                             return stream.Index;
                         }
@@ -1577,10 +1582,17 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
-                if ((profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) ||
+                // FFmpeg cannot mux VobSub back into an .idx/.sub pair, so extracted VobSub streams are matched against external .mks delivery profiles.
+                bool isVobSubMksProfile = string.Equals(profile.Format, "mks", StringComparison.OrdinalIgnoreCase)
+                    && subtitleStream.IsVobSubSubtitleStream
+                    && (!subtitleStream.IsExternal || subtitleStream.Path.EndsWith(".mks", StringComparison.OrdinalIgnoreCase));
+
+                if ((profile.Method == SubtitleDeliveryMethod.External
+                        && (isVobSubMksProfile || subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))) ||
                     (profile.Method == SubtitleDeliveryMethod.Hls && subtitleStream.IsTextSubtitleStream))
                 {
-                    bool requiresConversion = !string.Equals(subtitleStream.Codec, profile.Format, StringComparison.OrdinalIgnoreCase);
+                    bool requiresConversion = !isVobSubMksProfile
+                        && !string.Equals(subtitleStream.Codec, profile.Format, StringComparison.OrdinalIgnoreCase);
 
                     if (!requiresConversion)
                     {
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index dad4a6e149..f057714bea 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -644,13 +644,32 @@ namespace MediaBrowser.Model.Entities
             }
         }
 
+        [JsonIgnore]
+        public bool IsVobSubSubtitleStream
+        {
+            get
+            {
+                if (Type != MediaStreamType.Subtitle)
+                {
+                    return false;
+                }
+
+                if (string.IsNullOrEmpty(Codec) && !IsExternal)
+                {
+                    return false;
+                }
+
+                return IsVobSubFormat(Codec);
+            }
+        }
+
         /// <summary>
         /// Gets a value indicating whether this is a subtitle steam that is extractable by ffmpeg.
         /// All text-based and pgs subtitles can be extracted.
         /// </summary>
         /// <value><c>true</c> if this is a extractable subtitle steam otherwise, <c>false</c>.</value>
         [JsonIgnore]
-        public bool IsExtractableSubtitleStream => IsTextSubtitleStream || IsPgsSubtitleStream;
+        public bool IsExtractableSubtitleStream => IsTextSubtitleStream || IsPgsSubtitleStream || IsVobSubSubtitleStream;
 
         /// <summary>
         /// Gets or sets a value indicating whether [supports external stream].
@@ -728,6 +747,7 @@ namespace MediaBrowser.Model.Entities
             return codec.Contains("microdvd", StringComparison.OrdinalIgnoreCase)
                    || (!codec.Contains("pgs", StringComparison.OrdinalIgnoreCase)
                        && !codec.Contains("dvdsub", StringComparison.OrdinalIgnoreCase)
+                       && !codec.Contains("vobsub", StringComparison.OrdinalIgnoreCase)
                        && !codec.Contains("dvbsub", StringComparison.OrdinalIgnoreCase)
                        && !string.Equals(codec, "sup", StringComparison.OrdinalIgnoreCase)
                        && !string.Equals(codec, "sub", StringComparison.OrdinalIgnoreCase));
@@ -741,6 +761,14 @@ namespace MediaBrowser.Model.Entities
                    || string.Equals(codec, "sup", StringComparison.OrdinalIgnoreCase);
         }
 
+        public static bool IsVobSubFormat(string format)
+        {
+            string codec = format ?? string.Empty;
+
+            return codec.Contains("dvdsub", StringComparison.OrdinalIgnoreCase)
+                   || codec.Contains("vobsub", StringComparison.OrdinalIgnoreCase);
+        }
+
         public bool SupportsSubtitleConversionTo(string toCodec)
         {
             if (!IsTextSubtitleStream)
-- 
cgit v1.2.3


From d69de6ccc4cc1e3f6309364ea65efd92e8f91bf0 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Mon, 1 Jun 2026 20:57:59 +0200
Subject: Prefer subtitle extension over codec

---
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index ddb078127b..77aadee704 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -214,7 +214,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 };
             }
 
-            var currentFormat = subtitleStream.Codec ?? Path.GetExtension(subtitleStream.Path).TrimStart('.');
+            var currentFormat = (Path.GetExtension(subtitleStream.Path) ?? subtitleStream.Codec).TrimStart('.');
 
             // Handle PGS subtitles as raw streams for the client to render
             if (MediaStream.IsPgsFormat(currentFormat))
-- 
cgit v1.2.3


From efb0336369a2738825f0f0940c3d969c94a81d4e Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Thu, 28 May 2026 19:55:15 +0200
Subject: Fix subtitle replacement not invalidating cache

---
 .../Subtitles/SubtitleEncoder.cs                   | 102 ++++++++++++++++++++-
 1 file changed, 97 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index ddb078127b..3e4c9a6f52 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -214,7 +214,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 };
             }
 
-            var currentFormat = subtitleStream.Codec ?? Path.GetExtension(subtitleStream.Path).TrimStart('.');
+            // Normalize ffmpeg codec names to the file extensions the parser is keyed on
+            var currentFormat = NormalizeCodecToParserExtension(subtitleStream.Codec ?? Path.GetExtension(subtitleStream.Path).TrimStart('.'));
 
             // Handle PGS subtitles as raw streams for the client to render
             if (MediaStream.IsPgsFormat(currentFormat))
@@ -324,13 +325,91 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             using (await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false))
             {
-                if (!File.Exists(outputPath) || _fileSystem.GetFileInfo(outputPath).Length == 0)
+                if (!IsCachedSubtitleFresh(outputPath, subtitleStream.Path))
                 {
                     await ConvertTextSubtitleToSrtInternal(subtitleStream, mediaSource, outputPath, cancellationToken).ConfigureAwait(false);
                 }
             }
         }
 
+        // ffmpeg codec names don't always match the file extensions the subtitle parser is keyed on.
+        private static string NormalizeCodecToParserExtension(string codecOrExtension)
+        {
+            return codecOrExtension switch
+            {
+                "subrip" => "srt",
+                "webvtt" => "vtt",
+                _ => codecOrExtension
+            };
+        }
+
+        // Records "this cache was built from this exact source revision" in a sidecar file next to the cache: "<sizeBytes>:<mtimeTicks>"
+        private static string GetCacheMetaPath(string cachePath) => cachePath + ".meta";
+
+        private static string FormatCacheMeta(long length, DateTime lastWriteUtc)
+            => string.Create(CultureInfo.InvariantCulture, $"{length}:{lastWriteUtc.Ticks}");
+
+        private bool IsCachedSubtitleFresh(string cachePath, string? sourcePath)
+        {
+            if (!File.Exists(cachePath))
+            {
+                return false;
+            }
+
+            var cacheInfo = _fileSystem.GetFileInfo(cachePath);
+            if (cacheInfo.Length == 0)
+            {
+                return false;
+            }
+
+            if (string.IsNullOrEmpty(sourcePath) || !File.Exists(sourcePath))
+            {
+                return true;
+            }
+
+            var metaPath = GetCacheMetaPath(cachePath);
+            if (!File.Exists(metaPath))
+            {
+                // Pre-existing cache from before metadata tracking - regenerate so we can record the source state.
+                return false;
+            }
+
+            try
+            {
+                var sourceInfo = _fileSystem.GetFileInfo(sourcePath);
+                var expected = FormatCacheMeta(sourceInfo.Length, sourceInfo.LastWriteTimeUtc);
+                var actual = File.ReadAllText(metaPath);
+                return string.Equals(expected, actual, StringComparison.Ordinal);
+            }
+            catch (IOException)
+            {
+                return false;
+            }
+        }
+
+        private void WriteCacheMeta(string cachePath, string? sourcePath)
+        {
+            if (string.IsNullOrEmpty(sourcePath))
+            {
+                return;
+            }
+
+            try
+            {
+                var sourceInfo = _fileSystem.GetFileInfo(sourcePath);
+                if (!sourceInfo.Exists)
+                {
+                    return;
+                }
+
+                File.WriteAllText(GetCacheMetaPath(cachePath), FormatCacheMeta(sourceInfo.Length, sourceInfo.LastWriteTimeUtc));
+            }
+            catch (IOException ex)
+            {
+                _logger.LogWarning(ex, "Failed to record subtitle cache metadata for {CachePath}", cachePath);
+            }
+        }
+
         /// <summary>
         /// Converts the text subtitle to SRT internal.
         /// </summary>
@@ -375,7 +454,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     CreateNoWindow = true,
                     UseShellExecute = false,
                     FileName = _mediaEncoder.EncoderPath,
-                    Arguments = string.Format(CultureInfo.InvariantCulture, "{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath),
+                    Arguments = string.Format(CultureInfo.InvariantCulture, "-y {0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath),
                     WindowStyle = ProcessWindowStyle.Hidden,
                     ErrorDialog = false
                 },
@@ -455,6 +534,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             await SetAssFont(outputPath, cancellationToken).ConfigureAwait(false);
 
+            WriteCacheMeta(outputPath, inputPath);
+
             _logger.LogInformation("ffmpeg subtitle conversion succeeded for {Path}", inputPath);
         }
 
@@ -531,7 +612,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
                     var releaser = await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false);
 
-                    if (File.Exists(outputPath) && _fileSystem.GetFileInfo(outputPath).Length > 0)
+                    var sourcePath = string.IsNullOrEmpty(subtitleStream.Path) ? mediaSource.Path : subtitleStream.Path;
+                    if (IsCachedSubtitleFresh(outputPath, sourcePath))
                     {
                         releaser.Dispose();
                         continue;
@@ -588,7 +670,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 var outputPaths = new List<string>();
                 var args = string.Format(
                     CultureInfo.InvariantCulture,
-                    "-i {0}",
+                    "-y -i {0}",
                     inputPath);
 
                 foreach (var subtitleStream in subtitleStreams)
@@ -628,6 +710,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 }
 
                 await ExtractSubtitlesForFile(inputPath, args, outputPaths, cancellationToken).ConfigureAwait(false);
+
+                foreach (var outputPath in outputPaths)
+                {
+                    WriteCacheMeta(outputPath, mksFile);
+                }
             }
         }
 
@@ -683,6 +770,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             if (outputPaths.Count > 0)
             {
                 await ExtractSubtitlesForFile(inputPath, args, outputPaths, cancellationToken).ConfigureAwait(false);
+
+                foreach (var outputPath in outputPaths)
+                {
+                    WriteCacheMeta(outputPath, mediaSource.Path);
+                }
             }
         }
 
-- 
cgit v1.2.3


From d0a8445f763e654b3cd75a6c784c04dfde3f27a1 Mon Sep 17 00:00:00 2001
From: theguymadmax <theguymadmax@proton.me>
Date: Fri, 12 Jun 2026 11:44:26 -0400
Subject: Fix duplicate key collision

---
 MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
index 975c2b8161..fa2085ca6f 100644
--- a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
+++ b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
@@ -76,7 +76,13 @@ namespace MediaBrowser.MediaEncoding.Probing
         /// <returns>Dictionary{System.StringSystem.String}.</returns>
         private static Dictionary<string, string?> ConvertDictionaryToCaseInsensitive(IReadOnlyDictionary<string, string?> dict)
         {
-            return new Dictionary<string, string?>(dict, StringComparer.OrdinalIgnoreCase);
+            var result = new Dictionary<string, string?>(dict.Count, StringComparer.OrdinalIgnoreCase);
+            foreach (var (key, value) in dict)
+            {
+                result.TryAdd(key, value);
+            }
+
+            return result;
         }
     }
 }
-- 
cgit v1.2.3