lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract the MediaEncoder probing command arguments builder

Browse Source
This commit is contained in:
Vincent Lark 2023-10-26 20:06:45 +02:00
parent 8ee9a0adf9
commit 123c6e7d1b
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -418,10 +418,24 @@ namespace MediaBrowser.MediaEncoding.Encoder
public Task<MediaInfo> GetMediaInfo(MediaInfoRequest request, CancellationToken cancellationToken) public Task<MediaInfo> GetMediaInfo(MediaInfoRequest request, CancellationToken cancellationToken)
{ {
var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters; var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters;
var requiredHeaders = request.MediaSource.RequiredHttpHeaders; var extraArgs = GetExtraArguments(request);
var analyzeDuration = string.Empty;
return GetMediaInfoInternal(
GetInputArgument(request.MediaSource.Path, request.MediaSource),
request.MediaSource.Path,
request.MediaSource.Protocol,
extractChapters,
extraArgs,
request.MediaType == DlnaProfileType.Audio,
request.MediaSource.VideoType,
cancellationToken);
}
internal string GetExtraArguments(MediaInfoRequest request)
{
var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty; var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty;
var ffmpegProbeSize = _config.GetFFmpegProbeSize() ?? string.Empty; var ffmpegProbeSize = _config.GetFFmpegProbeSize() ?? string.Empty;
var analyzeDuration = string.Empty;
var extraArgs = string.Empty; var extraArgs = string.Empty;
if (request.MediaSource.AnalyzeDurationMs > 0) if (request.MediaSource.AnalyzeDurationMs > 0)
@ -443,20 +457,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
extraArgs += " -probesize " + ffmpegProbeSize; extraArgs += " -probesize " + ffmpegProbeSize;
} }
if (requiredHeaders.ContainsKey("user_agent")) if (request.MediaSource.RequiredHttpHeaders.TryGetValue("user_agent", out var userAgent))
{ {
extraArgs += " -user_agent " + requiredHeaders["user_agent"]; extraArgs += " -user_agent " + userAgent;
} }
return GetMediaInfoInternal( return extraArgs;
GetInputArgument(request.MediaSource.Path, request.MediaSource),
request.MediaSource.Path,
request.MediaSource.Protocol,
extractChapters,
extraArgs,
request.MediaType == DlnaProfileType.Audio,
request.MediaSource.VideoType,
cancellationToken);
} }
/// <inheritdoc /> /// <inheritdoc />

11
tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs
View File

@ -1,5 +1,5 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.MediaEncoding.Encoder; using MediaBrowser.MediaEncoding.Encoder;
using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Globalization;
@ -15,7 +15,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
public class ProbeExternalSourcesTests public class ProbeExternalSourcesTests
{ {
[Fact] [Fact]
public void GetMediaInfo_Uses_UserAgent() public void GetExtraArguments_Forwards_UserAgent()
{ {
var encoder = new MediaEncoder( var encoder = new MediaEncoder(
Mock.Of<ILogger<MediaEncoder>>(), Mock.Of<ILogger<MediaEncoder>>(),
@ -26,6 +26,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
new ConfigurationBuilder().Build(), new ConfigurationBuilder().Build(),
Mock.Of<IServerConfigurationManager>()); Mock.Of<IServerConfigurationManager>());
var userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64)";
var req = new MediaBrowser.Controller.MediaEncoding.MediaInfoRequest() var req = new MediaBrowser.Controller.MediaEncoding.MediaInfoRequest()
{ {
MediaSource = new MediaBrowser.Model.Dto.MediaSourceInfo MediaSource = new MediaBrowser.Model.Dto.MediaSourceInfo
@ -34,14 +35,16 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
Protocol = MediaProtocol.Http, Protocol = MediaProtocol.Http,
RequiredHttpHeaders = new Dictionary<string, string>() RequiredHttpHeaders = new Dictionary<string, string>()
{ {
{ "user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/530.35 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/530.35" }, { "user_agent", userAgent },
} }
}, },
ExtractChapters = false, ExtractChapters = false,
MediaType = MediaBrowser.Model.Dlna.DlnaProfileType.Video, MediaType = MediaBrowser.Model.Dlna.DlnaProfileType.Video,
}; };
encoder.GetMediaInfo(req, CancellationToken.None); var extraArg = encoder.GetExtraArguments(req);
Assert.Contains(userAgent, extraArg, StringComparison.InvariantCulture);
} }
} }
} }