ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

std::min and std::max are templates, and can't be combined with 'using'.

This commit is contained in:
Stephen Anthony 2022-06-05 11:40:04 -02:30
parent f8e1ebac82
commit 226ceea12f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/emucore/tia/frame-manager/JitterEmulation.cxx
View File

@ -17,8 +17,6 @@
#include <cmath> #include <cmath>
using std::abs; using std::abs;
using std::max;
using std::min;
using std::pow; using std::pow;
using std::round; using std::round;
@ -90,14 +88,14 @@ void JitterEmulation::frameComplete(Int32 scanlineCount, Int32 vsyncCycles)
&& abs(myJitter) < static_cast<Int32>(myRandom.next() % myJitterLines)) && abs(myJitter) < static_cast<Int32>(myRandom.next() % myJitterLines))
{ {
// Repeated invalid frames cause randomly repeated jitter // Repeated invalid frames cause randomly repeated jitter
myJitter = max(min(scanlineDifference, myJitterLines), -myYStart); myJitter = std::max(std::min(scanlineDifference, myJitterLines), -myYStart);
} }
} }
if(!vsyncCyclesStable) if(!vsyncCyclesStable)
{ {
// If VSYNC length is too low, the frame rolls permanently down, speed depending on missing cycles // If VSYNC length is too low, the frame rolls permanently down, speed depending on missing cycles
const Int32 jitter = max( const Int32 jitter = std::max(
min<Int32>(round(scanlineCount * (1 - static_cast<float>(vsyncCycles) / myVsyncCycles)), std::min<Int32>(round(scanlineCount * (1 - static_cast<float>(vsyncCycles) / myVsyncCycles)),
myJitterLines), myJitterLines),
myJitterRecovery + 1); // Roll at least one scanline myJitterRecovery + 1); // Roll at least one scanline
@ -114,7 +112,7 @@ void JitterEmulation::frameComplete(Int32 scanlineCount, Int32 vsyncCycles)
myJitter += vsyncCycles > myLastFrameVsyncCycles ? myVsyncLines : -myVsyncLines; myJitter += vsyncCycles > myLastFrameVsyncCycles ? myVsyncLines : -myVsyncLines;
#endif #endif
} }
myJitter = max(myJitter, -myYStart); myJitter = std::max(myJitter, -myYStart);
} }
} }
else else
@ -123,9 +121,9 @@ void JitterEmulation::frameComplete(Int32 scanlineCount, Int32 vsyncCycles)
// Only recover during stable frames // Only recover during stable frames
if(myJitter > 0) if(myJitter > 0)
myJitter = max(myJitter - myJitterRecovery, 0); myJitter = std::max(myJitter - myJitterRecovery, 0);
else if(myJitter < 0) else if(myJitter < 0)
myJitter = min(myJitter + myJitterRecovery, 0); myJitter = std::min(myJitter + myJitterRecovery, 0);
} }
myLastFrameScanlines = scanlineCount; myLastFrameScanlines = scanlineCount;