jp9000
/
obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #459 from BtbN/nvenc_delay_perf" 

This reverts commit e4e06afc0a, reversing
changes made to 388701bd26.
master
jp9000 2016-08-29 12:45:08 -07:00
parent 116b214be7
commit 98bf425474
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ObsNvenc/src/NVENCEncoder.cpp
View File

@ -209,7 +209,7 @@ void NVENCEncoder::init()
encoderPreset = NV_ENC_PRESET_HQ_GUID; encoderPreset = NV_ENC_PRESET_HQ_GUID;
is2PassRC = false; is2PassRC = false;
} }
if (height > 720 || (height == 720 && fps > 60)) if (height > 720 || (height == 720 && fps > 30))
{ {
encoderPreset = NV_ENC_PRESET_LOW_LATENCY_HQ_GUID; encoderPreset = NV_ENC_PRESET_LOW_LATENCY_HQ_GUID;
is2PassRC = false; is2PassRC = false;
@ -590,7 +590,7 @@ bool NVENCEncoder::Encode(LPVOID picIn, List<DataPacket> &packets, List<PacketTy
} }
} }
if (!outputSurfaceQueueReady.empty() && (!picIn || outputSurfaceQueue.size() + outputSurfaceQueueReady.size() >= maxSurfaceCount - 1)) if (!outputSurfaceQueueReady.empty())
{ {
NVENCEncoderOutputSurface *qSurf = outputSurfaceQueueReady.front(); NVENCEncoderOutputSurface *qSurf = outputSurfaceQueueReady.front();
outputSurfaceQueueReady.pop(); outputSurfaceQueueReady.pop();