From 6796b3435d893fde8c1ae7551f52b1fbb1bc489c Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Fri, 12 Sep 2025 21:58:28 +0200
Subject: Avoid constant arrays as arguments (#14784)

---
 MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 8d6211051b..ef912f42c3 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using Jellyfin.Data.Enums;
@@ -22,6 +21,8 @@ namespace MediaBrowser.Controller.MediaEncoding
     // For now, a common base class until the API and MediaEncoding classes are unified
     public class EncodingJobInfo
     {
+        private static readonly char[] _separators = ['|', ','];
+
         public int? OutputAudioBitrate;
         public int? OutputAudioChannels;
 
@@ -586,7 +587,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (!string.IsNullOrEmpty(BaseRequest.Profile))
             {
-                return BaseRequest.Profile.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                return BaseRequest.Profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
             }
 
             if (!string.IsNullOrEmpty(codec))
@@ -595,7 +596,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!string.IsNullOrEmpty(profile))
                 {
-                    return profile.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    return profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
                 }
             }
 
@@ -606,7 +607,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (!string.IsNullOrEmpty(BaseRequest.VideoRangeType))
             {
-                return BaseRequest.VideoRangeType.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                return BaseRequest.VideoRangeType.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
             }
 
             if (!string.IsNullOrEmpty(codec))
@@ -615,7 +616,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!string.IsNullOrEmpty(rangetype))
                 {
-                    return rangetype.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    return rangetype.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
                 }
             }
 
@@ -626,7 +627,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (!string.IsNullOrEmpty(BaseRequest.CodecTag))
             {
-                return BaseRequest.CodecTag.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                return BaseRequest.CodecTag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
             }
 
             if (!string.IsNullOrEmpty(codec))
@@ -635,7 +636,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!string.IsNullOrEmpty(codectag))
                 {
-                    return codectag.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    return codectag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
                 }
             }
 
-- 
cgit v1.2.3


From 2a499aaa9513c7d7b768dbf95756dfb4f8109a45 Mon Sep 17 00:00:00 2001
From: Thomas Jones <tjwalkr3@gmail.com>
Date: Sat, 20 Sep 2025 23:31:58 -0600
Subject: Fix CA1051 warnings in EncodingJobInfo.cs

Convert public fields to auto-properties and fix member ordering

Co-authored-by: Derpipose <90276123+Derpipose@users.noreply.github.com>
---
 MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index ef912f42c3..43680f5c01 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -23,9 +23,6 @@ namespace MediaBrowser.Controller.MediaEncoding
     {
         private static readonly char[] _separators = ['|', ','];
 
-        public int? OutputAudioBitrate;
-        public int? OutputAudioChannels;
-
         private TranscodeReason? _transcodeReasons = null;
 
         public EncodingJobInfo(TranscodingJobType jobType)
@@ -37,6 +34,10 @@ namespace MediaBrowser.Controller.MediaEncoding
             SupportedSubtitleCodecs = Array.Empty<string>();
         }
 
+        public int? OutputAudioBitrate { get; set; }
+
+        public int? OutputAudioChannels { get; set; }
+
         public TranscodeReason TranscodeReasons
         {
             get
-- 
cgit v1.2.3


From 9c298c52f5fb35c55377c9db754c9f6a43256415 Mon Sep 17 00:00:00 2001
From: Tim Eisele <Ghost_of_Stone@web.de>
Date: Fri, 26 Sep 2025 21:45:01 +0200
Subject: Expose ExtractAllExtractableSubtitles (#14876)

---
 MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs | 8 ++++++++
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs   | 9 ++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding')

diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
index 9bf27b3b2e..bdd75da2f5 100644
--- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -53,5 +53,13 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>System.String.</returns>
         Task<string> GetSubtitleFilePath(MediaStream subtitleStream, MediaSourceInfo mediaSource, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Extracts all extractable subtitles (text and pgs).
+        /// </summary>
+        /// <param name="mediaSource">The mediaSource.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task ExtractAllExtractableSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 6408f81acc..88a7bb4b41 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -477,13 +477,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 || string.Equals(codec, "pgssub", StringComparison.OrdinalIgnoreCase);
         }
 
-        /// <summary>
-        /// Extracts all extractable subtitles (text and pgs).
-        /// </summary>
-        /// <param name="mediaSource">The mediaSource.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        private async Task ExtractAllExtractableSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken)
+        /// <inheritdoc />
+        public async Task ExtractAllExtractableSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken)
         {
             var locks = new List<IDisposable>();
             var extractableStreams = new List<MediaStream>();
-- 
cgit v1.2.3