aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
author不帅你报警 <yrjyrj123@qq.com>2020-07-26 23:47:29 +0800
committerGitHub <noreply@github.com>2020-07-26 23:47:29 +0800
commitd5dcb12407f785ee6f06f5cd91bbda4d398aaf58 (patch)
treef62da3fcc745d1f924fc3f0d85f5452ed24dce94 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parent8ab800508bb140d8671125245a64c9d27adcad13 (diff)
Update EncodingHelper.cs
Fix the problem that hardware decoding cannot be used on macOS.
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index c20c9c2c4..8321e82f4 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -456,7 +456,8 @@ namespace MediaBrowser.Controller.MediaEncoding
var isQsvEncoder = outputVideoCodec.IndexOf("qsv", StringComparison.OrdinalIgnoreCase) != -1;
var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
var isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
-
+ var isMacOS = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+
if (!IsCopyCodec(outputVideoCodec))
{
if (state.IsVideoRequest
@@ -511,6 +512,12 @@ namespace MediaBrowser.Controller.MediaEncoding
}
}
}
+
+ if (state.IsVideoRequest
+ && string.Equals(encodingOptions.HardwareAccelerationType, "videotoolbox", StringComparison.OrdinalIgnoreCase))
+ {
+ arg.Append("-hwaccel videotoolbox ");
+ }
}
arg.Append("-i ")