From 8dc58e8f04ca891aa8e515c369f14ecbb21d2191 Mon Sep 17 00:00:00 2001
From: null <9310d27e@gmail.com>
Date: Sun, 20 Aug 2023 21:18:55 +0400
Subject: Added handling of FFmpeg:probesize variable

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index d61430b0b..f8d2dd40f 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -5678,7 +5678,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             // Apply -analyzeduration as per the environment variable,
             // otherwise ffmpeg will break on certain files due to default value is 0.
-            // The default value of -probesize is more than enough, so leave it as is.
             var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty;
 
             if (state.MediaSource.AnalyzeDurationMs > 0)
@@ -5697,6 +5696,22 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             inputModifier = inputModifier.Trim();
 
+            // Apply -probesize if configured
+            var probeSizeArgument = string.Empty;
+            var ffmpegProbeSize = _config.GetFFmpegProbeSize();
+
+            if (!string.IsNullOrEmpty(ffmpegProbeSize))
+            {
+                probeSizeArgument = $"-probesize {probeSizeArgument}";
+            }
+
+            if (!string.IsNullOrEmpty(probeSizeArgument))
+            {
+                inputModifier += $" {probeSizeArgument}";
+            }
+
+            inputModifier = inputModifier.Trim();
+
             var userAgentParam = GetUserAgentParam(state);
 
             if (!string.IsNullOrEmpty(userAgentParam))
-- 
cgit v1.2.3


From a18b3fbe70429f55852f0aebeda4e02e2abdef77 Mon Sep 17 00:00:00 2001
From: Claus Vium <cvium@users.noreply.github.com>
Date: Fri, 6 Oct 2023 10:49:20 +0200
Subject: simplify the if

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index f8d2dd40f..449ea6489 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -5697,21 +5697,13 @@ namespace MediaBrowser.Controller.MediaEncoding
             inputModifier = inputModifier.Trim();
 
             // Apply -probesize if configured
-            var probeSizeArgument = string.Empty;
             var ffmpegProbeSize = _config.GetFFmpegProbeSize();
 
             if (!string.IsNullOrEmpty(ffmpegProbeSize))
             {
-                probeSizeArgument = $"-probesize {probeSizeArgument}";
+                inputModifier += $" -probesize {ffmpegProbeSize}";
             }
 
-            if (!string.IsNullOrEmpty(probeSizeArgument))
-            {
-                inputModifier += $" {probeSizeArgument}";
-            }
-
-            inputModifier = inputModifier.Trim();
-
             var userAgentParam = GetUserAgentParam(state);
 
             if (!string.IsNullOrEmpty(userAgentParam))
-- 
cgit v1.2.3