gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed camera frame acquisition on Windows 7

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/12210
This commit is contained in:
Sam Lantinga
2025-02-16 08:13:35 -08:00
parent e3d9f1172c
commit 1754943596
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/camera/mediafoundation/SDL_camera_mediafoundation.c
View File

@@ -600,23 +600,18 @@ static SDL_CameraFrameResult MEDIAFOUNDATION_AcquireFrame(SDL_Camera *device, SD
IMF2DBuffer2_Unlock2D(buffer2d2); IMF2DBuffer2_Unlock2D(buffer2d2);
} }
IMF2DBuffer2_Release(buffer2d2); IMF2DBuffer2_Release(buffer2d2);
} else if (SUCCEEDED(IMFMediaBuffer_QueryInterface(buffer, &SDL_IID_IMF2DBuffer, (void **)&buffer2d))) { } else if (frame->format != SDL_PIXELFORMAT_MJPG &&
SUCCEEDED(IMFMediaBuffer_QueryInterface(buffer, &SDL_IID_IMF2DBuffer, (void **)&buffer2d))) {
ret = IMF2DBuffer_Lock2D(buffer2d, &pixels, &pitch); ret = IMF2DBuffer_Lock2D(buffer2d, &pixels, &pitch);
if (FAILED(ret)) { if (FAILED(ret)) {
result = SDL_CAMERA_FRAME_ERROR; result = SDL_CAMERA_FRAME_ERROR;
} else { } else {
if (frame->format == SDL_PIXELFORMAT_MJPG) { BYTE *bufstart = pixels;
// FIXME: How big is this frame? const DWORD buflen = SDL_abs((int)pitch) * frame->h;
const DWORD buflen = 0; if (pitch < 0) { // image rows are reversed.
result = MEDIAFOUNDATION_CopyFrame(frame, pixels, pitch, buflen); bufstart += -pitch * (frame->h - 1);
} else {
BYTE *bufstart = pixels;
const DWORD buflen = (SDL_abs((int)pitch) * frame->w) * frame->h;
if (pitch < 0) { // image rows are reversed.
bufstart += -pitch * (frame->h - 1);
}
result = MEDIAFOUNDATION_CopyFrame(frame, bufstart, pitch, buflen);
} }
result = MEDIAFOUNDATION_CopyFrame(frame, bufstart, pitch, buflen);
IMF2DBuffer_Unlock2D(buffer2d); IMF2DBuffer_Unlock2D(buffer2d);
} }
IMF2DBuffer_Release(buffer2d); IMF2DBuffer_Release(buffer2d);