Merge pull request #1046 from nyanmisaka/hwaccel

Add more separate hardware decoding toggles

src/controllers/dashboard/dashboard.js

@@ -252,12 +252,6 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 html += '</div>';
                 html += '</div>';
 
-                if (session.TranscodingInfo && session.TranscodingInfo.Framerate) {
-                    html += '<div class="sessionTranscodingFramerate">' + session.TranscodingInfo.Framerate + ' fps</div>';
-                } else {
-                    html += '<div class="sessionTranscodingFramerate"></div>';
-                }
-
                 html += '<div class="sessionNowPlayingDetails">';
                 var nowPlayingName = DashboardPage.getNowPlayingName(session);
                 html += '<div class="sessionNowPlayingInfo" data-imgsrc="' + nowPlayingName.image + '">';

src/controllers/dashboard/encodingsettings.js

@@ -5,6 +5,8 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
         Array.prototype.forEach.call(page.querySelectorAll('.chkDecodeCodec'), function (c) {
             c.checked = -1 !== (config.HardwareDecodingCodecs || []).indexOf(c.getAttribute('data-codec'));
         });
+        page.querySelector('#chkDecodingColorDepth10Hevc').checked = config.EnableDecodingColorDepth10Hevc;
+        page.querySelector('#chkDecodingColorDepth10Vp9').checked = config.EnableDecodingColorDepth10Vp9;
         page.querySelector('#chkHardwareEncoding').checked = config.EnableHardwareEncoding;
         $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
         $('#selectThreadCount', page).val(config.EncodingThreadCount);
@@ -67,6 +69,8 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
                 }), function (c) {
                     return c.getAttribute('data-codec');
                 });
+                config.EnableDecodingColorDepth10Hevc = form.querySelector('#chkDecodingColorDepth10Hevc').checked;
+                config.EnableDecodingColorDepth10Vp9 = form.querySelector('#chkDecodingColorDepth10Vp9').checked;
                 config.EnableHardwareEncoding = form.querySelector('#chkHardwareEncoding').checked;
                 ApiClient.updateNamedConfiguration('encoding', config).then(function () {
                     updateEncoder(form);

src/encodingsettings.html

@@ -19,6 +19,7 @@
                         <option value="nvenc">Nvidia NVENC</option>
                         <option value="vaapi">Video Acceleration API (VAAPI)</option>
                         <option value="h264_v4l2m2m">Exynos V4L2 MFC</option>
+                        <option value="videotoolbox">Video ToolBox</option>
                     </select>
                     <div class="fieldDescription">
                         <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="https://docs.jellyfin.org/general/administration/hardware-acceleration.html" target="_blank">${LabelHardwareAccelerationTypeHelp}</a>
@@ -35,36 +36,49 @@
                         <h3 class="checkboxListLabel">${LabelEnableHardwareDecodingFor}</h3>
                         <div class="checkboxList">
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="h264" data-types="qsv,nvenc,omx,mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="h264" data-types="amf,qsv,nvenc,vaapi,omx,mediacodec,videotoolbox" />
                                 <span>H264</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="hevc" data-types="qsv,nvenc,mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="hevc" data-types="amf,qsv,nvenc,vaapi,mediacodec,videotoolbox" />
                                 <span>HEVC</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg2video" data-types="qsv,nvenc,omx,mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg2video" data-types="amf,qsv,nvenc,vaapi,omx,mediacodec,videotoolbox" />
                                 <span>MPEG2</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg4" data-types="nvenc,mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg4" data-types="amf,nvenc,omx,mediacodec,videotoolbox" />
                                 <span>MPEG4</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vc1" data-types="qsv,nvenc" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vc1" data-types="amf,qsv,nvenc,vaapi,omx,videotoolbox" />
                                 <span>VC1</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp8" data-types="mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp8" data-types="qsv,nvenc,vaapi,mediacodec,videotoolbox" />
                                 <span>VP8</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp9" data-types="mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp9" data-types="amf,qsv,nvenc,vaapi,mediacodec,videotoolbox" />
                                 <span>VP9</span>
                             </label>
                         </div>
                     </div>
 
+                    <div class="checkboxListContainer">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkDecodingColorDepth10Hevc" />
+                            <span>${EnableDecodingColorDepth10Hevc}</span>
+                        </label>
+                    </div>
+                    <div class="checkboxListContainer">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkDecodingColorDepth10Vp9" />
+                            <span>${EnableDecodingColorDepth10Vp9}</span>
+                        </label>
+                    </div>
+
                     <div class="checkboxListContainer">
                         <div class="checkboxList">
                             <label>

src/strings/en-us.json

@@ -225,6 +225,8 @@
     "EnableBackdropsHelp": "Display backdrops in the background of some pages while browsing the library.",
     "EnableCinemaMode": "Cinema mode",
     "EnableColorCodedBackgrounds": "Color coded backgrounds",
+    "EnableDecodingColorDepth10Hevc": "Enable 10-Bit hardware decoding for HEVC",
+    "EnableDecodingColorDepth10Vp9": "Enable 10-Bit hardware decoding for Vp9",
     "EnableDisplayMirroring": "Display mirroring",
     "EnableExternalVideoPlayers": "External video players",
     "EnableExternalVideoPlayersHelp": "An external player menu will be shown when starting video playback.",
@@ -1552,4 +1554,5 @@
     "UnsupportedPlayback": "Jellyfin cannot decrypt content protected by DRM but all content will be attempted regardless, including protected titles. Some files may appear completely black due to encryption or other unsupported features, such as interactive titles.",
     "EnableBlurhash": "Enable blurred placeholders for images",
     "EnableBlurhashHelp": "Images that are still being loaded will be displayed with a blurred placeholder"
+
 }

src/strings/zh-cn.json

@@ -1542,5 +1542,7 @@
     "LabelSyncPlayTimeOffset": "服务器时间偏移：",
     "HeaderSyncPlayEnabled": "同步播放已启用",
     "HeaderSyncPlaySelectGroup": "加入群组",
-    "EnableDetailsBannerHelp": "在项目详细信息页面的顶部显示横幅图片。"
+    "EnableDetailsBannerHelp": "在项目详细信息页面的顶部显示横幅图片。",
+    "EnableDecodingColorDepth10": "启用 10-Bit 硬件解码",
+    "EnableDecodingColorDepth10Help" : "在支持的硬件上启用 10-Bit 硬件解码。仅对 HEVC 和 VP9 格式起作用。如果你遇到了播放问题，请关闭这个选项。"
 }