Throttler: Rename "framelimiter" to "emulation speed". #3356

degasus · 2015-12-18T20:19:27Z

We don't throttle by frames, we throttle by coretiming speed.
So looking up VI for calculating the speed was just very wrong.
The new ini option is a float, 1.0f for fullspeed.
In the GUI, percentual values are used.

degasus · 2015-12-18T20:22:30Z

Alcaro> would personally use -1 or actually put in two billion, but your choice
degasus> Alcaro: indeed. <=0 would be better

JosJuice · 2015-12-18T20:27:23Z

It sounds like this will get rid of users setting Framelimit to 60 instead of Auto for no good reason and also the problem of the Framelimit being 5 after updating from old Dolphin versions that used the Audio option. If that's true, I'll be very happy.

MayImilae · 2015-12-19T05:51:03Z

I think this is a great idea! But this is a GUI change, so I want to see a screenshot.

Source/Core/DolphinWX/Config/GeneralConfigPane.cpp

 	m_cpu_engine_radiobox  = new wxRadioBox(this, wxID_ANY, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, m_cpu_engine_array_string, 0, wxRA_SPECIFY_ROWS);

 	m_dual_core_checkbox->SetToolTip(_("Splits the CPU and GPU threads so they can be run on separate cores.\nProvides major speed improvements on most modern PCs, but can cause occasional crashes/glitches."));
 	m_idle_skip_checkbox->SetToolTip(_("Attempt to detect and skip wait-loops.\nIf unsure, leave this checked."));
 	m_cheats_checkbox->SetToolTip(_("Enables the use of Action Replay and Gecko cheats."));
 	m_force_ntscj_checkbox->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nIf left unchecked, Dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games."));
-	m_frame_limit_choice->SetToolTip(_("Limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL)."));
+	m_throttler_choice->SetToolTip(_("Limits the game speed to the specified percentual value."));


Source/Core/VideoCommon/RenderBase.cpp

@@ -381,6 +381,7 @@ void Renderer::DrawDebugText()
 			std::string("Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""),
 			std::string("Copy EFB: ") + efbcopy_text,
 			std::string("Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"),
+			StringFromFormat("Speed: %li%%", std::lround(SConfig::GetInstance().m_EmulationSpeed * 100.f)),


Source/Core/AudioCommon/Mixer.cpp

 	{
-		aid_sample_rate = aid_sample_rate * (framelimit - 1) * 5 / VideoInterface::TargetRefreshRate;


psennermann · 2015-12-20T16:58:36Z

Just for curiosity I tested a bit the frame limiter on master 4.0-8396 and found out that the auto setting doesn't seem 100% accurate playing in a window: in Wii Sports I get sometimes weird slowdowns (although the counter still indicates 60 fps 100% speed, gameplay slows down - could be timings slowdowns?); instead disabling framelimiter and enabling Vsync (in fact limiting frames with Vsync), I can get complete smooth gameplay (no more slowdowns in this way).
Also notice that using exclusive fullscreen the slowdowns turn into occasional screen tearing, so In conclusion it seems to me that auto framelimiter sometimes has to "adjust" his speed in comparison to the one of the monitor, while Vsync obviously doesn't have this problem...

P.S. I tested at 1920x1080 - 60 hz

JosJuice · 2015-12-20T17:33:42Z

It seems a bit strange that hotkeys can be used to set values that aren't available in the GUI. For instance, decreasing from 100% would go 100%, 90%, 81%, 72.9%, 65.61%...

Source/Core/Core/Core.cpp

@@ -755,9 +755,9 @@ void VideoThrottle()
 // depending on the framelimit set


JosJuice · 2016-01-02T14:03:34Z

Ping.

We don't throttle by frames, we throttle by coretiming speed. So looking up VI for calculating the speed was just very wrong. The new ini option is a float, 1.0f for fullspeed. In the GUI, percentual values are used.

JosJuice · 2016-01-05T23:01:46Z

LGTM.

Throttler: Rename "framelimiter" to "emulation speed".

dolphin-emu-bot · 2016-01-07T02:19:34Z

FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:

chibi-robo-zfighting on ogl-lin-radeon: diff
medabots-crash on ogl-lin-radeon: diff
mp3-bloom on ogl-lin-radeon: diff
rs2-skybox on ogl-lin-radeon: diff
rs2-zfreeze on ogl-lin-radeon: diff
sf-assault-flashing on ogl-lin-radeon: diff
sms-bubbles on ogl-lin-radeon: diff
sw3-dt on ogl-lin-radeon: diff

_{^{automated-fifoci-reporter}}

psennermann · 2016-01-09T10:01:57Z

it would be more useful to have the ability to set the exact desired speed percentage (like 99, 98 and so on for "fine tuning") or at least 95%, because 90% is already too slow (not to mention that speeds below it are pretty much useless)

JosJuice · 2016-01-09T10:06:09Z

For now, you can do that by editing the INI file. I'm not sure what you would need it for, though.

psennermann · 2016-01-09T10:09:53Z

For example some time ago was noticed that Tales of Symphonia with auto frame limit was slightly faster that original Gamecube game, so if the problem persists with actual builds, it could be useful to set it at 99 or 98%...

JosJuice · 2016-01-09T10:20:35Z

If that's a problem, it should have a proper fix, not a workaround based on setting the speed limit. Make an report on the issue tracker if it happens in the newest development version. https://bugs.dolphin-emu.org/projects/emulator

psennermann · 2016-01-09T13:27:05Z

It was only an example, other uses could be limit the speed because not always reaching 60 fps 100% speed due to hardware not powerful enough (maybe they could play without sound cutting at 57 fps - 95% speed instead of slowing too much at 54 fps - 90% speed)...

P.S. I think adding a 95% speed option would be enough (before I wasn't thinking in percentage so I thought that 95% was 55 fps, instead it would be 57, so further values/options wouldn't be so useful...)

pauldacheez reviewed Dec 19, 2015
View reviewed changes

degasus force-pushed the master branch from 82929a4 to 24be139 Compare December 19, 2015 10:07

pauldacheez reviewed Dec 19, 2015
View reviewed changes

degasus force-pushed the master branch from 24be139 to 2327d55 Compare December 19, 2015 10:19

BhaaLseN reviewed Dec 19, 2015
View reviewed changes

Source/Core/AudioCommon/Mixer.cpp

{

aid_sample_rate = aid_sample_rate * (framelimit - 1) * 5 / VideoInterface::TargetRefreshRate;

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

degasus force-pushed the master branch from 2327d55 to 133ae36 Compare December 19, 2015 12:46

JosJuice reviewed Dec 20, 2015
View reviewed changes

Source/Core/Core/Core.cpp

@@ -755,9 +755,9 @@ void VideoThrottle()

// depending on the framelimit set

This comment was marked as off-topic.

Sign in to view

degasus force-pushed the master branch from 133ae36 to 29d36c7 Compare December 22, 2015 11:08

degasus force-pushed the master branch from 29d36c7 to 3ff4ec2 Compare January 5, 2016 22:37

Throttler: Rename "framelimiter" to "emulation speed".

3ff4ec2

We don't throttle by frames, we throttle by coretiming speed. So looking up VI for calculating the speed was just very wrong. The new ini option is a float, 1.0f for fullspeed. In the GUI, percentual values are used.

degasus added a commit that referenced this pull request Jan 6, 2016

Merge pull request #3356 from degasus/master

86b0e7e

Throttler: Rename "framelimiter" to "emulation speed".

degasus merged commit 86b0e7e into dolphin-emu:master Jan 6, 2016

Throttler: Rename "framelimiter" to "emulation speed". #3356

Throttler: Rename "framelimiter" to "emulation speed". #3356

degasus commented Dec 18, 2015

degasus commented Dec 18, 2015

JosJuice commented Dec 18, 2015

MayImilae commented Dec 19, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

psennermann commented Dec 20, 2015

JosJuice commented Dec 20, 2015

This comment was marked as off-topic.

JosJuice commented Jan 2, 2016

JosJuice commented Jan 5, 2016

dolphin-emu-bot commented Jan 7, 2016

psennermann commented Jan 9, 2016

JosJuice commented Jan 9, 2016

psennermann commented Jan 9, 2016

JosJuice commented Jan 9, 2016

psennermann commented Jan 9, 2016

		{
		aid_sample_rate = aid_sample_rate * (framelimit - 1) * 5 / VideoInterface::TargetRefreshRate;

		@@ -755,9 +755,9 @@ void VideoThrottle()
		// depending on the framelimit set

Throttler: Rename "framelimiter" to "emulation speed". #3356

Throttler: Rename "framelimiter" to "emulation speed". #3356

Conversation

degasus commented Dec 18, 2015

degasus commented Dec 18, 2015

JosJuice commented Dec 18, 2015

MayImilae commented Dec 19, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

psennermann commented Dec 20, 2015

JosJuice commented Dec 20, 2015

This comment was marked as off-topic.

JosJuice commented Jan 2, 2016

JosJuice commented Jan 5, 2016

dolphin-emu-bot commented Jan 7, 2016

psennermann commented Jan 9, 2016

JosJuice commented Jan 9, 2016

psennermann commented Jan 9, 2016

JosJuice commented Jan 9, 2016

psennermann commented Jan 9, 2016