Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113209 from shiena/fix/prevent_freeze_android_camera

Browse source 
Prevent deadlock on Android camera
This commit is contained in:
Rémi Verschelde 2025-11-27 09:56:08 +01:00
commit 3a97723ff2
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/camera/camera_android.cpp
View file

@ -489,33 +489,36 @@ void CameraFeedAndroid::onSessionClosed(void *context, ACameraCaptureSession *se
} }
void CameraFeedAndroid::deactivate_feed() { void CameraFeedAndroid::deactivate_feed() {
// First, remove image listener to prevent new callbacks.
if (reader != nullptr) {
AImageReader_setImageListener(reader, nullptr);
}
// Stop and close capture session.
// These calls may wait for pending callbacks to complete.
if (session != nullptr) { if (session != nullptr) {
ACameraCaptureSession_stopRepeating(session); ACameraCaptureSession_stopRepeating(session);
ACameraCaptureSession_close(session); ACameraCaptureSession_close(session);
session = nullptr; session = nullptr;
} }
if (reader != nullptr) { // Now safe to acquire lock and clean up resources.
AImageReader_setImageListener(reader, nullptr); // No new callbacks will be triggered after this point.
MutexLock lock(callback_mutex);
if (device != nullptr) {
ACameraDevice_close(device);
device = nullptr;
} }
{ if (reader != nullptr) {
MutexLock lock(callback_mutex); AImageReader_delete(reader);
reader = nullptr;
}
if (device != nullptr) { if (request != nullptr) {
ACameraDevice_close(device); ACaptureRequest_free(request);
device = nullptr; request = nullptr;
}
if (reader != nullptr) {
AImageReader_delete(reader);
reader = nullptr;
}
if (request != nullptr) {
ACaptureRequest_free(request);
request = nullptr;
}
} }
} }