Skip to content

steamcompmgr: consistently use the texture dimensions to write a screenshot to file #2181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oSoMoN wants to merge 1 commit into
base: master
Choose a base branch
from
Open

steamcompmgr: consistently use the texture dimensions to write a screenshot to file #2181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions src/steamcompmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2969,33 +2969,35 @@ paint_all( global_focus_t *pFocus, bool async )
pthread_setname_np( pthread_self(), "gamescope-scrsh" );

const uint8_t *mappedData = pScreenshotTexture->mappedData();
const uint32_t width = pScreenshotTexture->width();
const uint32_t height = pScreenshotTexture->height();

bool bScreenshotSuccess = false;

if ( pScreenshotTexture->format() == VK_FORMAT_A2R10G10B10_UNORM_PACK32 )
{
// Make our own copy of the image to remove the alpha channel.
constexpr uint32_t kCompCnt = 3;
auto imageData = std::vector<uint16_t>( g_nOutputWidth * g_nOutputHeight * kCompCnt );
auto imageData = std::vector<uint16_t>( width * height * kCompCnt );

for (uint32_t y = 0; y < g_nOutputHeight; y++)
for (uint32_t y = 0; y < height; y++)
{
for (uint32_t x = 0; x < g_nOutputWidth; x++)
for (uint32_t x = 0; x < width; x++)
{
uint32_t *pInPixel = (uint32_t *)&mappedData[(y * pScreenshotTexture->rowPitch()) + x * (32 / 8)];
uint32_t uInPixel = *pInPixel;

imageData[y * g_nOutputWidth * kCompCnt + x * kCompCnt + 0] = (uInPixel & (0b1111111111 << 20)) >> 20;
imageData[y * g_nOutputWidth * kCompCnt + x * kCompCnt + 1] = (uInPixel & (0b1111111111 << 10)) >> 10;
imageData[y * g_nOutputWidth * kCompCnt + x * kCompCnt + 2] = (uInPixel & (0b1111111111 << 0)) >> 0;
imageData[y * width * kCompCnt + x * kCompCnt + 0] = (uInPixel & (0b1111111111 << 20)) >> 20;
imageData[y * width * kCompCnt + x * kCompCnt + 1] = (uInPixel & (0b1111111111 << 10)) >> 10;
imageData[y * width * kCompCnt + x * kCompCnt + 2] = (uInPixel & (0b1111111111 << 0)) >> 0;
}
}

assert( HAVE_AVIF );
#if HAVE_AVIF
avifResult avifResult = AVIF_RESULT_OK;

avifImage *pAvifImage = avifImageCreate( g_nOutputWidth, g_nOutputHeight, 10, AVIF_PIXEL_FORMAT_YUV444 );
avifImage *pAvifImage = avifImageCreate( width, height, 10, AVIF_PIXEL_FORMAT_YUV444 );
defer( avifImageDestroy( pAvifImage ) );
pAvifImage->yuvRange = AVIF_RANGE_FULL;
pAvifImage->colorPrimaries = bHDRScreenshot ? AVIF_COLOR_PRIMARIES_BT2020 : AVIF_COLOR_PRIMARIES_BT709;
Expand Down Expand Up @@ -3025,7 +3027,7 @@ paint_all( global_focus_t *pFocus, bool async )
rgbAvifImage.ignoreAlpha = AVIF_TRUE;

rgbAvifImage.pixels = (uint8_t *)imageData.data();
rgbAvifImage.rowBytes = g_nOutputWidth * kCompCnt * sizeof( uint16_t );
rgbAvifImage.rowBytes = width * kCompCnt * sizeof( uint16_t );

if ( ( avifResult = avifImageRGBToYUV( pAvifImage, &rgbAvifImage ) ) != AVIF_RESULT_OK ) // Not really! See Matrix Coefficients IDENTITY above.
{
Expand Down Expand Up @@ -3070,12 +3072,12 @@ paint_all( global_focus_t *pFocus, bool async )
else if (pScreenshotTexture->format() == VK_FORMAT_B8G8R8A8_UNORM)
{
// Make our own copy of the image to remove the alpha channel.
auto imageData = std::vector<uint8_t>(currentOutputWidth * currentOutputHeight * 4);
auto imageData = std::vector<uint8_t>(width * height * 4);
const uint32_t comp = 4;
const uint32_t pitch = currentOutputWidth * comp;
for (uint32_t y = 0; y < currentOutputHeight; y++)
const uint32_t pitch = width * comp;
for (uint32_t y = 0; y < height; y++)
{
for (uint32_t x = 0; x < currentOutputWidth; x++)
for (uint32_t x = 0; x < width; x++)
{
// BGR...
imageData[y * pitch + x * comp + 0] = mappedData[y * pScreenshotTexture->rowPitch() + x * comp + 2];
Expand All @@ -3084,7 +3086,7 @@ paint_all( global_focus_t *pFocus, bool async )
imageData[y * pitch + x * comp + 3] = 255;
}
}
if ( stbi_write_png( oScreenshotInfo->szScreenshotPath.c_str(), currentOutputWidth, currentOutputHeight, 4, imageData.data(), pitch ) )
if ( stbi_write_png( oScreenshotInfo->szScreenshotPath.c_str(), width, height, 4, imageData.data(), pitch ) )
{
xwm_log.infof( "Screenshot saved to %s", oScreenshotInfo->szScreenshotPath.c_str() );
bScreenshotSuccess = true;
Expand All @@ -3107,7 +3109,7 @@ paint_all( global_focus_t *pFocus, bool async )

#if 0
char cmd[4096];
sprintf(cmd, "ffmpeg -f rawvideo -pixel_format nv12 -video_size %dx%d -i %s %s_encoded.png", pScreenshotTexture->width(), pScreenshotTexture->height(), oScreenshotInfo->szScreenshotPath.c_str(), oScreenshotInfo->szScreenshotPath.c_str() );
sprintf(cmd, "ffmpeg -f rawvideo -pixel_format nv12 -video_size %dx%d -i %s %s_encoded.png", width, height, oScreenshotInfo->szScreenshotPath.c_str(), oScreenshotInfo->szScreenshotPath.c_str() );

int ret = system(cmd);

Expand Down