PCSX2/archived-pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-01-31 01:15:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

recording: Lock frameCounter incrementation on initial recording file load or during full/fast boot

Browse Source 
Ensures that no frames of input are skipped over on the initial load of a recording file or during a fast/full boot when a recording file is active. Improved consistency.
This commit is contained in:
sonicfind
2020-09-13 14:06:07 -05:00
committed by refractionpcsx2
parent 5c5d3a770f
commit f881bd9bd6
5 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pcsx2/Recording/InputRecording.cpp
View File

@@ -49,7 +49,7 @@ void SaveStateBase::InputRecordingFreeze()
else if (g_InputRecording.IsActive())
{
// Explicitly set the frame change tracking variable as to not
// detect loading a savestate as a frame being drawn
// detect saving or loading a savestate as a frame being drawn
g_InputRecordingControls.SetFrameCountTracker(g_FrameCount);
if (IsLoading())
@@ -77,11 +77,11 @@ void Pcsx2App::RecordingReset()
}
else if (g_InputRecording.IsActive())
{
// Explicitly set the frame change tracking variable as to not
// detect rebooting as a frame being drawn
g_InputRecordingControls.SetFrameCountTracker(g_FrameCount);
g_InputRecording.SetFrameCounter(0);
g_InputRecordingControls.Lock(0, false);
}
else
g_InputRecordingControls.Resume();
}
InputRecording g_InputRecording;
@@ -138,7 +138,7 @@ void InputRecording::ControllerInterrupt(u8 &data, u8 &port, u16 &bufCount, u8 b
}
}
u32 InputRecording::GetFrameCounter()
s32 InputRecording::GetFrameCounter()
{
return frameCounter;
}
@@ -218,13 +218,7 @@ void InputRecording::SetToReplayMode()
}
void InputRecording::SetFrameCounter(u32 newGFrameCount)
{
// Forces inputRecording to wait for a confirmed pause before resetting
// frameCounter to the proper value. Ensures that any lingering emulation
// before the load doesn't increment the already reset value
const bool initiallyPaused = g_InputRecordingControls.IsRecordingPaused();
if (!initiallyPaused)
g_InputRecordingControls.PauseImmediately();
{
if (newGFrameCount > startingFrame + g_InputRecording.GetInputRecordingData().GetTotalFrames())
{
recordingConLog(L"[REC]: Warning, you've loaded PCSX2 emulation to a point after the end of the original recording. This should be avoided.\n");
@@ -246,10 +240,12 @@ void InputRecording::SetFrameCounter(u32 newGFrameCount)
SetToReplayMode();
}
}
else if (newGFrameCount == 0 && state == InputRecordingMode::Recording)
{
SetToReplayMode();
}
frameCounter = static_cast<s32>(newGFrameCount - startingFrame);
incrementUndo = true;
if (!initiallyPaused)
g_InputRecordingControls.Resume();
}
}
@@ -263,6 +259,7 @@ void InputRecording::SetStartingFrame(u32 newStartingFrame)
}
frameCounter = 0;
initialLoad = false;
g_InputRecordingControls.Lock(startingFrame, inputRecordingData.FromSaveState());
}
void InputRecording::Stop()