aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs32
1 files changed, 19 insertions, 13 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index e8041f198..4dbefca4b 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -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 />