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

Merge pull request #834 from PCSX2/gsdx-prog-rec 

GSdx: recording: Progressive: make the recorded clip play at full speed
This commit is contained in:
avih 2015-09-19 04:46:05 -07:00
parent ddb87027f9 54afd377ee
commit 56452481e2
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GSRenderer.cpp
View File

@ -358,7 +358,7 @@ void GSRenderer::VSync(int field)
s = format( s = format(
"%lld | %d x %d | %.2f fps (%d%%) | %s - %s | %s | %d S/%d P/%d D | %d%% CPU | %.2f | %.2f", "%lld | %d x %d | %.2f fps (%d%%) | %s - %s | %s | %d S/%d P/%d D | %d%% CPU | %.2f | %.2f",
m_perfmon.GetFrame(), r.width(), r.height(), fps, (int)(100.0 * fps / GetFPS()), m_perfmon.GetFrame(), r.width(), r.height(), fps, (int)(100.0 * fps / GetTvRefreshRate()),
s2.c_str(), s2.c_str(),
theApp.m_gs_interlace[m_interlace].name.c_str(), theApp.m_gs_interlace[m_interlace].name.c_str(),
theApp.m_gs_aspectratio[m_aspectratio].name.c_str(), theApp.m_gs_aspectratio[m_aspectratio].name.c_str(),
@ -533,7 +533,7 @@ bool GSRenderer::MakeSnapshot(const string& path)
bool GSRenderer::BeginCapture() bool GSRenderer::BeginCapture()
{ {
return m_capture.BeginCapture(GetFPS()); return m_capture.BeginCapture(GetTvRefreshRate());
} }
void GSRenderer::EndCapture() void GSRenderer::EndCapture()

6
plugins/GSdx/GSState.cpp
View File

@ -465,11 +465,9 @@ bool GSState::IsEnabled(int i)
return false; return false;
} }
float GSState::GetFPS() float GSState::GetTvRefreshRate()
{ {
float base_rate = ((m_regs->SMODE1.CMOD & 1) ? 25 : (30/1.001f)); return (m_regs->SMODE1.CMOD & 1) ? 50 : (60/1.001f);
return base_rate * (m_regs->SMODE2.INT ? 2 : 1);
} }
// GIFPackedRegHandler* // GIFPackedRegHandler*

2
plugins/GSdx/GSState.h
View File

@ -225,7 +225,7 @@ public:
bool IsEnabled(int i); bool IsEnabled(int i);
float GetFPS(); float GetTvRefreshRate();
virtual void Reset(); virtual void Reset();
virtual void Flush(); virtual void Flush();