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

camera: Fix Emscripten builds when using -sASYNCIFY.

Browse Source 
Thanks to user pancakeswya on GitHub for the patch!

Fixes #13934.
This commit is contained in:
Ryan C. Gordon
2025-10-09 09:54:48 -04:00
parent a6fc2c4b60
commit 09bd8e8a5a
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/camera/emscripten/SDL_camera_emscripten.c
View File

@@ -33,8 +33,6 @@
// each EM_ASM section is ugly. // each EM_ASM section is ugly.
/* *INDENT-OFF* */ // clang-format off /* *INDENT-OFF* */ // clang-format off
EM_JS_DEPS(sdlcamera, "$dynCall");
static bool EMSCRIPTENCAMERA_WaitDevice(SDL_Camera *device) static bool EMSCRIPTENCAMERA_WaitDevice(SDL_Camera *device)
{ {
SDL_assert(!"This shouldn't be called"); // we aren't using SDL's internal thread. SDL_assert(!"This shouldn't be called"); // we aren't using SDL's internal thread.
@@ -98,7 +96,7 @@ static void EMSCRIPTENCAMERA_CloseDevice(SDL_Camera *device)
} }
} }
static int SDLEmscriptenCameraPermissionOutcome(SDL_Camera *device, int approved, int w, int h, int fps) EMSCRIPTEN_KEEPALIVE int SDLEmscriptenCameraPermissionOutcome(SDL_Camera *device, int approved, int w, int h, int fps)
{ {
if (approved) { if (approved) {
device->actual_spec.format = SDL_PIXELFORMAT_RGBA32; device->actual_spec.format = SDL_PIXELFORMAT_RGBA32;
@@ -118,6 +116,10 @@ static int SDLEmscriptenCameraPermissionOutcome(SDL_Camera *device, int approved
return approved; return approved;
} }
EMSCRIPTEN_KEEPALIVE bool SDLEmscriptenThreadIterate(SDL_Camera *device) {
return SDL_CameraThreadIterate(device);
}
static bool EMSCRIPTENCAMERA_OpenDevice(SDL_Camera *device, const SDL_CameraSpec *spec) static bool EMSCRIPTENCAMERA_OpenDevice(SDL_Camera *device, const SDL_CameraSpec *spec)
{ {
MAIN_THREAD_EM_ASM({ MAIN_THREAD_EM_ASM({
@@ -128,8 +130,8 @@ static bool EMSCRIPTENCAMERA_OpenDevice(SDL_Camera *device, const SDL_CameraSpec
const h = $2; const h = $2;
const framerate_numerator = $3; const framerate_numerator = $3;
const framerate_denominator = $4; const framerate_denominator = $4;
const outcome = $5; const outcome = Module._SDLEmscriptenCameraPermissionOutcome;
const iterate = $6; const iterate = Module._SDLEmscriptenThreadIterate;
const constraints = {}; const constraints = {};
if ((w <= 0) || (h <= 0)) { if ((w <= 0) || (h <= 0)) {
@@ -155,7 +157,7 @@ static bool EMSCRIPTENCAMERA_OpenDevice(SDL_Camera *device, const SDL_CameraSpec
const nextframems = SDL3.camera.next_frame_time; const nextframems = SDL3.camera.next_frame_time;
const now = performance.now(); const now = performance.now();
if (now >= nextframems) { if (now >= nextframems) {
dynCall('vi', iterate, [device]); // calls SDL_CameraThreadIterate, which will call our AcquireFrame implementation. iterate(device); // calls SDL_CameraThreadIterate, which will call our AcquireFrame implementation.
// bump ahead but try to stay consistent on timing, in case we dropped frames. // bump ahead but try to stay consistent on timing, in case we dropped frames.
while (SDL3.camera.next_frame_time < now) { while (SDL3.camera.next_frame_time < now) {
@@ -174,7 +176,7 @@ static bool EMSCRIPTENCAMERA_OpenDevice(SDL_Camera *device, const SDL_CameraSpec
const actualfps = settings.frameRate; const actualfps = settings.frameRate;
console.log("Camera is opened! Actual spec: (" + actualw + "x" + actualh + "), fps=" + actualfps); console.log("Camera is opened! Actual spec: (" + actualw + "x" + actualh + "), fps=" + actualfps);
if (dynCall('iiiiii', outcome, [device, 1, actualw, actualh, actualfps])) { if (outcome(device, 1, actualw, actualh, actualfps)) {
const video = document.createElement("video"); const video = document.createElement("video");
video.width = actualw; video.width = actualw;
video.height = actualh; video.height = actualh;
@@ -207,9 +209,9 @@ static bool EMSCRIPTENCAMERA_OpenDevice(SDL_Camera *device, const SDL_CameraSpec
}) })
.catch((err) => { .catch((err) => {
console.error("Tried to open camera but it threw an error! " + err.name + ": " + err.message); console.error("Tried to open camera but it threw an error! " + err.name + ": " + err.message);
dynCall('iiiiii', outcome, [device, 0, 0, 0, 0]); // we call this a permission error, because it probably is. outcome(device, 0, 0, 0, 0); // we call this a permission error, because it probably is.
}); });
}, device, spec->width, spec->height, spec->framerate_numerator, spec->framerate_denominator, SDLEmscriptenCameraPermissionOutcome, SDL_CameraThreadIterate); }, device, spec->width, spec->height, spec->framerate_numerator, spec->framerate_denominator);
return true; // the real work waits until the user approves a camera. return true; // the real work waits until the user approves a camera.
} }