starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 09:44:47 +03:00
Code Issues 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
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)
{
var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters;
var requiredHeaders = request.MediaSource.RequiredHttpHeaders;
var analyzeDuration = string.Empty;
var extraArgs = GetExtraArguments(request);
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 ffmpegProbeSize = _config.GetFFmpegProbeSize() ?? string.Empty;
var analyzeDuration = string.Empty;
var extraArgs = string.Empty;
if (request.MediaSource.AnalyzeDurationMs > 0)
@@ -443,20 +457,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
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(
GetInputArgument(request.MediaSource.Path, request.MediaSource),
request.MediaSource.Path,
request.MediaSource.Protocol,
extractChapters,
extraArgs,
request.MediaType == DlnaProfileType.Audio,
request.MediaSource.VideoType,
cancellationToken);
return extraArgs;
}
/// <inheritdoc />