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

Merge pull request #3551 from RisingFog/videodump_proper_delay 

Properly Handle Video Dumping from Power On
This commit is contained in:
Ryan Houdek 2016-03-03 10:38:36 -05:00
parent 46b5b07883 d39d193c0f
commit e60f0b3cf0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -21,6 +21,7 @@ extern "C" {
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/Movie.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h" //for TargetRefreshRate #include "Core/HW/VideoInterface.h" //for TargetRefreshRate
#include "VideoCommon/AVIDump.h" #include "VideoCommon/AVIDump.h"
@ -177,7 +178,9 @@ void AVIDump::AddFrame(const u8* data, int width, int height)
int error = 0; int error = 0;
u64 delta; u64 delta;
s64 last_pts; s64 last_pts;
if (!s_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond()) // Check to see if the first frame being dumped is the first frame of output from the emulator.
// This prevents an issue with starting dumping later in emulation from placing the frames incorrectly.
if (!s_start_dumping && Movie::g_currentFrame < 1)
{ {
delta = CoreTiming::GetTicks(); delta = CoreTiming::GetTicks();
last_pts = AV_NOPTS_VALUE; last_pts = AV_NOPTS_VALUE;