瀏覽代碼

Backport pull request #11857 from jellyfin/release-10.9.z

Fix ffprobe -user_agent parameter

Original-merge: d0336cd67edb3c70b9a0ec03a5ef1f991e3c9b84

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
gnattu 1 年之前
父節點
當前提交
8424ff5b61

+ 2 - 2
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -456,9 +456,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 extraArgs += " -probesize " + ffmpegProbeSize;
             }
 
-            if (request.MediaSource.RequiredHttpHeaders.TryGetValue("user_agent", out var userAgent))
+            if (request.MediaSource.RequiredHttpHeaders.TryGetValue("User-Agent", out var userAgent))
             {
-                extraArgs += " -user_agent " + userAgent;
+                extraArgs += $" -user_agent \"{userAgent}\"";
             }
 
             if (request.MediaSource.Protocol == MediaProtocol.Rtsp)

+ 2 - 2
tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs

@@ -35,7 +35,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
                     Protocol = MediaProtocol.Http,
                     RequiredHttpHeaders = new Dictionary<string, string>()
                     {
-                        { "user_agent", userAgent },
+                        { "User-Agent", userAgent },
                     }
                 },
                 ExtractChapters = false,
@@ -44,7 +44,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
 
             var extraArg = encoder.GetExtraArguments(req);
 
-            Assert.Contains(userAgent, extraArg, StringComparison.InvariantCulture);
+            Assert.Contains($"-user_agent \"{userAgent}\"", extraArg, StringComparison.InvariantCulture);
         }
     }
 }