moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-02-16 10:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle mismatched pitch between frame and texture

Browse Source
This commit is contained in:
Cameron Gutman
2022-01-02 14:35:14 -06:00
parent 1e9e96fb8c
commit 61092b34de
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/streaming/video/ffmpeg-renderers/sdlvid.cpp
View File

@@ -467,9 +467,9 @@ ReadbackRetry:
#endif
{
char* pixels;
int pitch;
int texturePitch;
err = SDL_LockTexture(m_Texture, nullptr, (void**)&pixels, &pitch);
err = SDL_LockTexture(m_Texture, nullptr, (void**)&pixels, &texturePitch);
if (err < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"SDL_LockTexture() failed: %s",
@@ -477,12 +477,37 @@ ReadbackRetry:
goto Exit;
}
memcpy(pixels,
frame->data[0],
frame->linesize[0] * frame->height);
memcpy(pixels + (frame->linesize[0] * frame->height),
frame->data[1],
frame->linesize[1] * frame->height / 2);
// If the planar pitches match, we can use a single memcpy() to transfer
// the data. If not, we'll need to do separate memcpy() calls for each
// line to ensure the pitch doesn't get screwed up.
if (frame->linesize[0] == texturePitch) {
memcpy(pixels,
frame->data[0],
frame->linesize[0] * frame->height);
}
else {
int pitch = SDL_min(frame->linesize[0], texturePitch);
for (int i = 0; i < frame->height; i++) {
memcpy(pixels + (texturePitch * i),
frame->data[0] + (frame->linesize[0] * i),
pitch);
}
}
if (frame->linesize[1] == texturePitch) {
memcpy(pixels + (texturePitch * frame->height),
frame->data[1],
frame->linesize[1] * frame->height / 2);
}
else {
int pitch = SDL_min(frame->linesize[1], texturePitch);
for (int i = 0; i < frame->height / 2; i++) {
memcpy(pixels + (texturePitch * (frame->height + i)),
frame->data[1] + (frame->linesize[1] * i),
pitch);
}
}
SDL_UnlockTexture(m_Texture);
}