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 #4148 from RisingFog/frame_dump_fixes 

Fix frame dump issues where frame dumping stops before next drawn frame
This commit is contained in:
shuffle2 2016-10-02 21:10:35 -07:00 committed by GitHub
parent 0e7179b538 69eed56256
commit 0e3f91d88b
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,11 +43,15 @@ static int s_width;
static int s_height; static int s_height;
static u64 s_last_frame; static u64 s_last_frame;
static bool s_start_dumping = false; static bool s_start_dumping = false;
static bool s_stop_dumping = false;
static u64 s_last_pts; static u64 s_last_pts;
static int s_current_width; static int s_current_width;
static int s_current_height; static int s_current_height;
static int s_file_index = 0; static int s_file_index = 0;
static AVIDump::DumpFormat s_current_format; static AVIDump::DumpFormat s_current_format;
static const u8* s_stored_frame_data;
static int s_stored_frame_width;
static int s_stored_frame_height;
static void InitAVCodec() static void InitAVCodec()
{ {
@ -82,6 +86,8 @@ bool AVIDump::Start(int w, int h, DumpFormat format)
s_last_frame = CoreTiming::GetTicks(); s_last_frame = CoreTiming::GetTicks();
s_last_pts = 0; s_last_pts = 0;
s_stop_dumping = false;
InitAVCodec(); InitAVCodec();
bool success = CreateFile(); bool success = CreateFile();
if (!success) if (!success)
@ -177,6 +183,9 @@ static void PreparePacket(AVPacket* pkt)
void AVIDump::AddFrame(const u8* data, int width, int height) void AVIDump::AddFrame(const u8* data, int width, int height)
{ {
// Store current frame data in case frame dumping stops before next frame update
if (!s_stop_dumping)
StoreFrameData(data, width, height);
CheckResolution(width, height); CheckResolution(width, height);
s_src_frame->data[0] = const_cast<u8*>(data); s_src_frame->data[0] = const_cast<u8*>(data);
s_src_frame->linesize[0] = width * s_bytes_per_pixel; s_src_frame->linesize[0] = width * s_bytes_per_pixel;
@ -252,6 +261,9 @@ void AVIDump::AddFrame(const u8* data, int width, int height)
void AVIDump::Stop() void AVIDump::Stop()
{ {
s_stop_dumping = true;
// Write the last stored frame just in case frame dumping stops before the next frame update
AddFrame(s_stored_frame_data, s_stored_frame_width, s_stored_frame_height);
av_write_trailer(s_format_context); av_write_trailer(s_format_context);
CloseFile(); CloseFile();
s_file_index = 0; s_file_index = 0;
@ -311,3 +323,10 @@ void AVIDump::CheckResolution(int width, int height)
s_current_height = height; s_current_height = height;
} }
} }
void AVIDump::StoreFrameData(const u8* data, int width, int height)
{
s_stored_frame_data = data;
s_stored_frame_width = width;
s_stored_frame_height = height;
}

1
Source/Core/VideoCommon/AVIDump.h
View File

@ -12,6 +12,7 @@ private:
static bool CreateFile(); static bool CreateFile();
static void CloseFile(); static void CloseFile();
static void CheckResolution(int width, int height); static void CheckResolution(int width, int height);
static void StoreFrameData(const u8* data, int width, int height);
public: public:
enum class DumpFormat enum class DumpFormat