CDROM: Fix incorrect clamp with seek speedup

And bump the minimum time up around 0.29ms or so, hopefully improve stability in FF7.
1 year ago · 46a6681159
parent 344a4a6215
commit 46a6681159
1 changed files with 2 additions and 2 deletions
--- a/src/core/cdrom.cpp
+++ b/src/core/cdrom.cpp
@ -1441,7 +1441,7 @@ TickCount CDROM::GetTicksForRead()

 TickCount CDROM::GetTicksForSeek(CDImage::LBA new_lba, bool ignore_speed_change)
 {
-  static constexpr TickCount MIN_TICKS = 20000;
+  static constexpr TickCount MIN_TICKS = 30000;

  if (g_settings.cdrom_seek_speedup == 0)
    return MIN_TICKS;
@ -1520,7 +1520,7 @@ TickCount CDROM::GetTicksForSeek(CDImage::LBA new_lba, bool ignore_speed_change)
  }

  if (g_settings.cdrom_seek_speedup > 1)
-    ticks = std::min<u32>(ticks / g_settings.cdrom_seek_speedup, MIN_TICKS);
+    ticks = std::max<u32>(ticks / g_settings.cdrom_seek_speedup, MIN_TICKS);

  return System::ScaleTicksToOverclock(static_cast<TickCount>(ticks));
 }