diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2023-10-06 11:38:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-06 11:38:45 +0200 |
| commit | 0d2202de4f934756213d5f213ed0ce7ac5ac7f76 (patch) | |
| tree | 776095a377debf96f7aabdc62f96e68e66a4960d /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | 6593aa125523611a215cf9d102598b8f00ba77b7 (diff) | |
| parent | d0dc080c93006b3cec0e111aa9c2a79c8d68872a (diff) | |
Merge pull request #10255 from thomasjohansen/fix/probesize
Fix/probesize
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 346e97ae1..90ef93720 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -419,6 +419,8 @@ namespace MediaBrowser.MediaEncoding.Encoder var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters; var analyzeDuration = string.Empty; var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty; + var ffmpegProbeSize = _config.GetFFmpegProbeSize() ?? string.Empty; + var extraArgs = string.Empty; if (request.MediaSource.AnalyzeDurationMs > 0) { @@ -429,12 +431,22 @@ namespace MediaBrowser.MediaEncoding.Encoder analyzeDuration = "-analyzeduration " + ffmpegAnalyzeDuration; } + if (!string.IsNullOrEmpty(analyzeDuration)) + { + extraArgs = analyzeDuration; + } + + if (!string.IsNullOrEmpty(ffmpegProbeSize)) + { + extraArgs += " -probesize " + ffmpegProbeSize; + } + return GetMediaInfoInternal( GetInputArgument(request.MediaSource.Path, request.MediaSource), request.MediaSource.Path, request.MediaSource.Protocol, extractChapters, - analyzeDuration, + extraArgs, request.MediaType == DlnaProfileType.Audio, request.MediaSource.VideoType, cancellationToken); |
