|
@@ -650,6 +650,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|
{
|
|
{
|
|
ArgumentException.ThrowIfNullOrEmpty(inputPath);
|
|
ArgumentException.ThrowIfNullOrEmpty(inputPath);
|
|
|
|
|
|
|
|
+ var useTradeoff = _config.GetFFmpegImgExtractPerfTradeoff();
|
|
|
|
+
|
|
var outputExtension = targetFormat?.GetExtension() ?? ".jpg";
|
|
var outputExtension = targetFormat?.GetExtension() ?? ".jpg";
|
|
|
|
|
|
var tempExtractPath = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid() + outputExtension);
|
|
var tempExtractPath = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid() + outputExtension);
|
|
@@ -684,7 +686,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|
|
|
|
|
// Use ffmpeg to sample 100 (we can drop this if required using thumbnail=50 for 50 frames) frames and pick the best thumbnail. Have a fall back just in case.
|
|
// Use ffmpeg to sample 100 (we can drop this if required using thumbnail=50 for 50 frames) frames and pick the best thumbnail. Have a fall back just in case.
|
|
// mpegts need larger batch size otherwise the corrupted thumbnail will be created. Larger batch size will lower the processing speed.
|
|
// mpegts need larger batch size otherwise the corrupted thumbnail will be created. Larger batch size will lower the processing speed.
|
|
- var enableThumbnail = useIFrame && !string.Equals("wtv", container, StringComparison.OrdinalIgnoreCase);
|
|
|
|
|
|
+ var enableThumbnail = !useTradeoff && useIFrame && !string.Equals("wtv", container, StringComparison.OrdinalIgnoreCase);
|
|
if (enableThumbnail)
|
|
if (enableThumbnail)
|
|
{
|
|
{
|
|
var useLargerBatchSize = string.Equals("mpegts", container, StringComparison.OrdinalIgnoreCase);
|
|
var useLargerBatchSize = string.Equals("mpegts", container, StringComparison.OrdinalIgnoreCase);
|
|
@@ -718,6 +720,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|
args = string.Format(CultureInfo.InvariantCulture, "-ss {0} ", GetTimeParameter(offset.Value)) + args;
|
|
args = string.Format(CultureInfo.InvariantCulture, "-ss {0} ", GetTimeParameter(offset.Value)) + args;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (useIFrame && useTradeoff)
|
|
|
|
+ {
|
|
|
|
+ args = "-skip_frame nokey " + args;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (!string.IsNullOrWhiteSpace(container))
|
|
if (!string.IsNullOrWhiteSpace(container))
|
|
{
|
|
{
|
|
var inputFormat = EncodingHelper.GetInputFormat(container);
|
|
var inputFormat = EncodingHelper.GetInputFormat(container);
|