diff --git a/src/BizHawk.Client.Common/movie/PlatformFrameRates.cs b/src/BizHawk.Client.Common/movie/PlatformFrameRates.cs index 15e7a0cc13..2717017be6 100644 --- a/src/BizHawk.Client.Common/movie/PlatformFrameRates.cs +++ b/src/BizHawk.Client.Common/movie/PlatformFrameRates.cs @@ -35,8 +35,8 @@ namespace BizHawk.Client.Common ["ChannelF_PAL"] = 15625.0 / 312.0, // 4000000 / (256 * 312) ["Coleco"] = 59.9227510135505, ["Doom"] = 35.0, - ["DOS"] = 70.086302895322945, // 226575000 / 3232800 -- The default framerate used in JPC-rr encodes - ["FDS"] = 60.098813897440515532, + ["DOS"] = 70.086303, // Video dump from DOSBox-X has 70086303/1000000 (70.086303) framerate when launching into DOS. + ["FDS"] = 60.098813897440515532, ["FDS_PAL"] = 50.006977968268290849, ["GEN"] = 53693175 / (3420.0 * 262), ["GEN_PAL"] = 53203424 / (3420.0 * 313), diff --git a/src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.ISettable.cs b/src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.ISettable.cs index 7bc7dbcc21..fd283dce87 100644 --- a/src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.ISettable.cs @@ -235,12 +235,12 @@ namespace BizHawk.Emulation.Cores.Computers.DOS public WriteableHardDiskOptions WriteableHardDisk { get; set; } [DisplayName("FPS Numerator")] - [Description("Numerator for FPS: how many Bizhawk frames to run per second of emulation. Default represents the numerator for the typical video frames per second in DOS (70.086302895322945). We recommend leaving this value unmodified. You can set it higher if you need finer subframe inputs, and; lower, in case your game runs in lower FPS and it feels more natural.")] + [Description("Numerator for FPS: how many Bizhawk frames to run per second of emulation. Default represents the numerator for the typical video frames per second in DOS (70.086303). We recommend leaving this value unmodified. You can set it higher if you need finer subframe inputs, and; lower, in case your game runs in lower FPS and it feels more natural.")] [DefaultValue(LibDOSBox.VIDEO_NUMERATOR_DOS)] public ulong FPSNumerator { get; set; } [DisplayName("FPS Denominator")] - [Description("Denominator for FPS: how many Bizhawk frames to run per second of emulation. Default represents the numerator for the typical video frames per second in DOS (70.086302895322945). We recommend leaving this value unmodified. You can set it lower if you need finer subframe inputs, and; higher, in case your game runs in lower FPS and it feels more natural.")] + [Description("Denominator for FPS: how many Bizhawk frames to run per second of emulation. Default represents the numerator for the typical video frames per second in DOS (70.086303). We recommend leaving this value unmodified. You can set it lower if you need finer subframe inputs, and; higher, in case your game runs in lower FPS and it feels more natural.")] [DefaultValue(LibDOSBox.VIDEO_DENOMINATOR_DOS)] public ulong FPSDenominator { get; set; } diff --git a/src/BizHawk.Emulation.Cores/Computers/DOS/LibDOSBox.cs b/src/BizHawk.Emulation.Cores/Computers/DOS/LibDOSBox.cs index 140610169c..67a32a2efd 100644 --- a/src/BizHawk.Emulation.Cores/Computers/DOS/LibDOSBox.cs +++ b/src/BizHawk.Emulation.Cores/Computers/DOS/LibDOSBox.cs @@ -13,9 +13,9 @@ namespace BizHawk.Emulation.Cores.Computers.DOS public const int SVGA_MAX_WIDTH = 800; public const int SVGA_MAX_HEIGHT = 600; - // Default FPS: 70.086302895322945 - public const int VIDEO_NUMERATOR_DOS = 226575000; - public const int VIDEO_DENOMINATOR_DOS = 3232800; + // Default FPS: 70.086303 + public const int VIDEO_NUMERATOR_DOS = 70086303; + public const int VIDEO_DENOMINATOR_DOS = 1000000; public const int FASTMEM_AUTO = -1; public const int MAX_FLOPPIES = 4;