From ebc617882b3375883d6c214381d44b9114f23d9e Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 7 Oct 2016 22:59:39 +0200 Subject: VideoCommon: Drop RepeatFrameDumpFrame helper. This was needed with fixed framerate dumping. As we now synchronize the frames, the last one will just get padded. --- Source/Core/VideoBackends/OGL/Render.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/Render.cpp') diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 2f53d0e9a6..39744b5211 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1353,7 +1353,6 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, if (Fifo::WillSkipCurrentFrame() || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { - RepeatFrameDumpFrame(); Core::Callback_VideoCopiedToXFB(false); return; } @@ -1363,7 +1362,6 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, FramebufferManager::GetXFBSource(xfbAddr, fbStride, fbHeight, &xfbCount); if (g_ActiveConfig.VirtualXFBEnabled() && (!xfbSourceList || xfbCount == 0)) { - RepeatFrameDumpFrame(); Core::Callback_VideoCopiedToXFB(false); return; } -- cgit v1.2.3 From b5a91e1dfaf62924e05421de48987c105546f8ca Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 8 Oct 2016 00:04:25 +0200 Subject: Framedumps: Add finish() function to limit memory lifetime. --- Source/Core/VideoBackends/OGL/Render.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/VideoBackends/OGL/Render.cpp') diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 39744b5211..27aff46e61 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1470,6 +1470,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, DumpFrameData(image.data(), flipped_trc.GetWidth(), flipped_trc.GetHeight(), AVIDump::DumpFormat::FORMAT_RGBA, true); + FinishFrameData(); } // Finish up the current frame, print some stats -- cgit v1.2.3 From 0864ef435219dbbded3b07a8159a85731e605087 Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 8 Oct 2016 15:28:12 +0200 Subject: VideoCommon: Add custom stride for framedumping. --- Source/Core/VideoBackends/OGL/Render.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/OGL/Render.cpp') diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 27aff46e61..4b8b638212 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1469,7 +1469,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, flipped_trc.GetHeight(), GL_RGBA, GL_UNSIGNED_BYTE, image.data()); DumpFrameData(image.data(), flipped_trc.GetWidth(), flipped_trc.GetHeight(), - AVIDump::DumpFormat::FORMAT_RGBA, true); + flipped_trc.GetWidth() * 4, AVIDump::DumpFormat::FORMAT_RGBA, true); FinishFrameData(); } // Finish up the current frame, print some stats -- cgit v1.2.3