Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 23:30:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Joshua M. Boniface 2022-03-23 15:25:39 -04:00 committed by GitHub
parent 945fb8b72e fb8ae0e9a1
commit 570660099b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View file

@ -2893,8 +2893,8 @@ namespace MediaBrowser.Controller.MediaEncoding
} }
var memoryOutput = false; var memoryOutput = false;
var isUploadForOclTonemap = isSwDecoder && doCuTonemap; var isUploadForCuTonemap = isSwDecoder && doCuTonemap;
if ((isNvDecoder && isSwEncoder) || isUploadForOclTonemap) if ((isNvDecoder && isSwEncoder) || (isUploadForCuTonemap && hasSubs))
{ {
memoryOutput = true; memoryOutput = true;
@ -2904,7 +2904,7 @@ namespace MediaBrowser.Controller.MediaEncoding
} }
// OUTPUT yuv420p surface(memory) // OUTPUT yuv420p surface(memory)
if (isSwDecoder && isNvencEncoder) if (isSwDecoder && isNvencEncoder && !isUploadForCuTonemap)
{ {
memoryOutput = true; memoryOutput = true;
} }