aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.MediaEncoding')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs51
1 files changed, 27 insertions, 24 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index cc6b51f58..b7c49ed99 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -609,6 +609,32 @@ namespace MediaBrowser.MediaEncoding.Encoder
return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, false, targetFormat, cancellationToken).ConfigureAwait(false);
}
+ private string GetImageResolutionParameter()
+ {
+ string imageResolutionParameter;
+
+ imageResolutionParameter = _serverConfig.Configuration.ChapterImageResolution switch
+ {
+ ImageResolution.P144 => "256x144",
+ ImageResolution.P240 => "426x240",
+ ImageResolution.P360 => "640x360",
+ ImageResolution.P480 => "854x480",
+ ImageResolution.P720 => "1280x720",
+ ImageResolution.P1080 => "1920x1080",
+ ImageResolution.P1440 => "2560x1440",
+ ImageResolution.P2160 => "3840x2160",
+ _ => string.Empty
+ };
+
+ if (!string.IsNullOrEmpty(imageResolutionParameter))
+ {
+ imageResolutionParameter = " -s " + imageResolutionParameter;
+ }
+
+ return imageResolutionParameter;
+ }
+
+
private async Task<string> ExtractImageInternal(string inputPath, string container, MediaStream videoStream, int? imageStreamIndex, Video3DFormat? threedFormat, TimeSpan? offset, bool useIFrame, ImageFormat? targetFormat, CancellationToken cancellationToken)
{
if (string.IsNullOrEmpty(inputPath))
@@ -626,29 +652,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
_ => ".jpg"
};
- bool enumConversionStatus = Enum.TryParse(_serverConfig.Configuration.ChapterImageResolution, out ImageResolution resolution);
- var outputResolution = string.Empty;
-
- if (enumConversionStatus)
- {
- outputResolution = resolution switch
- {
- ImageResolution.P240 => "426x240",
- ImageResolution.P360 => "640x360",
- ImageResolution.P480 => "854x480",
- ImageResolution.P720 => "1280x720",
- ImageResolution.P1080 => "1920x1080",
- ImageResolution.P1440 => "2560x1440",
- ImageResolution.P2160 => "3840x2160",
- _ => string.Empty
- };
-
- if (!string.IsNullOrEmpty(outputResolution))
- {
- outputResolution = " -s " + outputResolution;
- }
- }
-
var tempExtractPath = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid() + outputExtension);
Directory.CreateDirectory(Path.GetDirectoryName(tempExtractPath));
@@ -702,7 +705,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
var vf = string.Join(',', filters);
var mapArg = imageStreamIndex.HasValue ? (" -map 0:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty;
- var args = string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 -vf {2}{5} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, _threads, outputResolution);
+ var args = string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 -vf {2}{5} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, _threads, GetImageResolutionParameter());
if (offset.HasValue)
{