archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Video: move all padding added for frame dumping to a single function,

Browse source 
which also avoids the output window from being resized randomly to be a multiple of 4
This commit is contained in:
Filoppi 2024-02-23 04:09:49 +02:00
parent d6230bbad8
commit 1f34adf216
1 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Source/Core/VideoCommon/Present.cpp
View file

@ -213,19 +213,29 @@ void Presenter::ProcessFrameDumping(u64 ticks) const
{ {
MathUtil::Rectangle<int> target_rect; MathUtil::Rectangle<int> target_rect;
if (!g_ActiveConfig.bInternalResolutionFrameDumps && !g_gfx->IsHeadless()) if (!g_ActiveConfig.bInternalResolutionFrameDumps && !g_gfx->IsHeadless())
{
// This is already scaled by "VIDEO_ENCODER_LCM"
target_rect = GetTargetRectangle(); target_rect = GetTargetRectangle();
}
else else
{
target_rect = m_xfb_rect; target_rect = m_xfb_rect;
ASSERT(target_rect.top == 0 && target_rect.left == 0);
// Scale positively to make sure the least amount of information is lost. int width = target_rect.GetWidth();
// TODO: this should be added as black padding on the edges by the frame dumper int height = target_rect.GetHeight();
target_rect.right += VIDEO_ENCODER_LCM - (target_rect.GetWidth() % VIDEO_ENCODER_LCM);
target_rect.bottom += VIDEO_ENCODER_LCM - (target_rect.GetHeight() % VIDEO_ENCODER_LCM); // Ensure divisibility by "VIDEO_ENCODER_LCM" to make it compatible with all the video
} // encoders. Note that this is theoretically only necessary when recording videos and not
// screenshots.
// We always scale positively to make sure the least amount of information is lost.
//
// TODO: this should be added as black padding on the edges by the frame dumper.
if ((width % VIDEO_ENCODER_LCM) != 0)
width += VIDEO_ENCODER_LCM - (width % VIDEO_ENCODER_LCM);
if ((height % VIDEO_ENCODER_LCM) != 0)
height += VIDEO_ENCODER_LCM - (height % VIDEO_ENCODER_LCM);
// Remove any black borders, there would be no point in including them in the recording
target_rect.left = 0;
target_rect.top = 0;
target_rect.right = width;
target_rect.bottom = height;
g_frame_dumper->DumpCurrentFrame(m_xfb_entry->texture.get(), m_xfb_rect, target_rect, ticks, g_frame_dumper->DumpCurrentFrame(m_xfb_entry->texture.get(), m_xfb_rect, target_rect, ticks,
m_frame_count); m_frame_count);
@ -607,18 +617,7 @@ void Presenter::UpdateDrawRectangle()
int int_draw_width; int int_draw_width;
int int_draw_height; int int_draw_height;
if (g_frame_dumper->IsFrameDumping()) if (g_ActiveConfig.aspect_mode != AspectMode::Raw || !m_xfb_entry)
{
// ensure divisibility by "VIDEO_ENCODER_LCM" to make it compatible with all the video encoders.
// Note that this is theoretically only necessary when recording videos and not screenshots.
draw_width =
std::ceil(draw_width) - static_cast<int>(std::ceil(draw_width)) % VIDEO_ENCODER_LCM;
draw_height =
std::ceil(draw_height) - static_cast<int>(std::ceil(draw_height)) % VIDEO_ENCODER_LCM;
int_draw_width = static_cast<int>(draw_width);
int_draw_height = static_cast<int>(draw_height);
}
else if (g_ActiveConfig.aspect_mode != AspectMode::Raw || !m_xfb_entry)
{ {
// Find the best integer resolution: the closest aspect ratio with the least black bars. // Find the best integer resolution: the closest aspect ratio with the least black bars.
// This should have no influence if "AspectMode::Stretch" is active. // This should have no influence if "AspectMode::Stretch" is active.
@ -703,14 +702,6 @@ std::tuple<int, int> Presenter::CalculateOutputDimensions(int width, int height,
height = static_cast<int>(std::ceil(scaled_height)); height = static_cast<int>(std::ceil(scaled_height));
} }
if (g_frame_dumper->IsFrameDumping())
{
// UpdateDrawRectangle() makes sure that the rendered image is divisible by "VIDEO_ENCODER_LCM"
// for video encoders, so do that here too to match it
width -= width % VIDEO_ENCODER_LCM;
height -= height % VIDEO_ENCODER_LCM;
}
return std::make_tuple(width, height); return std::make_tuple(width, height);
} }