cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 09:59:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Enable H.264 Hi10P hardware decode for Apple Silicon on macOS >=14.6

Browse Source 
macOS 14.6 beta and macOS 15 beta enables h264 10bit hardware decode on Apple Silicon.

Signed-off-by: gnattu <gnattuoc@me.com>
This commit is contained in:
gnattu 2024-06-18 06:26:43 +08:00
parent f3e39e87d7
commit 9792fb117c
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
@ -5704,16 +5705,29 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
var bitDepth = GetVideoColorBitDepth(state); var bitDepth = GetVideoColorBitDepth(state);
// Only HEVC, VP9 and AV1 formats have 10-bit hardware decoder support now. // Only HEVC, VP9 and AV1 formats have 10-bit hardware decoder support for most platforms
if (bitDepth == 10 if (bitDepth == 10
&& !(string.Equals(videoStream.Codec, "hevc", StringComparison.OrdinalIgnoreCase) && !(string.Equals(videoStream.Codec, "hevc", StringComparison.OrdinalIgnoreCase)
|| string.Equals(videoStream.Codec, "h265", StringComparison.OrdinalIgnoreCase) || string.Equals(videoStream.Codec, "h265", StringComparison.OrdinalIgnoreCase)
|| string.Equals(videoStream.Codec, "vp9", StringComparison.OrdinalIgnoreCase) || string.Equals(videoStream.Codec, "vp9", StringComparison.OrdinalIgnoreCase)
|| string.Equals(videoStream.Codec, "av1", StringComparison.OrdinalIgnoreCase))) || string.Equals(videoStream.Codec, "av1", StringComparison.OrdinalIgnoreCase)))
{ {
// One exception is that RKMPP decoder can handle H.264 High 10. // RKMPP has H.264 Hi10P decoder
if (!(string.Equals(options.HardwareAccelerationType, "rkmpp", StringComparison.OrdinalIgnoreCase) bool hasHardwareHi10P = string.Equals(options.HardwareAccelerationType, "rkmpp", StringComparison.OrdinalIgnoreCase);
&& string.Equals(videoStream.Codec, "h264", StringComparison.OrdinalIgnoreCase)))
// VideoToolbox on Apple Silicon has H.264 Hi10P mode enabled after macOS 14.6
if (string.Equals(options.HardwareAccelerationType, "videotoolbox", StringComparison.OrdinalIgnoreCase))
{
var ver = Environment.OSVersion.Version;
var arch = RuntimeInformation.OSArchitecture;
if (arch.Equals(Architecture.Arm64) && ver >= new Version(14, 6))
{
hasHardwareHi10P = true;
}
}
if (!hasHardwareHi10P
&& string.Equals(videoStream.Codec, "h264", StringComparison.OrdinalIgnoreCase))
{ {
return null; return null;
} }