Merge pull request #7483 from jellyfin/swdec-cu-tonemap

3 years ago · 570660099b
parent 945fb8b72e fb8ae0e9a1
commit 570660099b
1 changed files with 3 additions and 3 deletions
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@ -2893,8 +2893,8 @@ namespace MediaBrowser.Controller.MediaEncoding
            }

            var memoryOutput = false;
-            var isUploadForOclTonemap = isSwDecoder && doCuTonemap;
-            if ((isNvDecoder && isSwEncoder) || isUploadForOclTonemap)
+            var isUploadForCuTonemap = isSwDecoder && doCuTonemap;
+            if ((isNvDecoder && isSwEncoder) || (isUploadForCuTonemap && hasSubs))
            {
                memoryOutput = true;

@ -2904,7 +2904,7 @@ namespace MediaBrowser.Controller.MediaEncoding
            }

            // OUTPUT yuv420p surface(memory)
-            if (isSwDecoder && isNvencEncoder)
+            if (isSwDecoder && isNvencEncoder && !isUploadForCuTonemap)
            {
                memoryOutput = true;
            }