summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Koivikko <[email protected]>2025-05-04 16:16:35 +0300
committerJarkko Koivikko <[email protected]>2025-05-23 05:05:24 +0000
commit73249c76a971ac08885d77a0c82246a5c1842a88 (patch)
treebcef8f6ac29322f5d046a31312ea6d8c93df3ff3
parent5d47d3569aa2de95e9beb7d9ab335bf156acb346 (diff)
Android: Fix still image capture stalling when flash is requiredHEADdev
Previously, the image capture pipeline could stall indefinitely if the camera reported CONTROL_AE_STATE_FLASH_REQUIRED during the exposure precapture phase. Pick-to: 6.9.1 6.9 6.8 Change-Id: I051af3aa0b47c7da2abea25c714c84216e7b0ed8 Reviewed-by: Tim Blechmann <[email protected]> Reviewed-by: Bartlomiej Moskal <[email protected]>
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/multimedia/QtCamera2.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/multimedia/QtCamera2.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtCamera2.java
index a0a8db5ff..fed212afb 100644
--- a/src/android/jar/src/org/qtproject/qt/android/multimedia/QtCamera2.java
+++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtCamera2.java
@@ -236,7 +236,9 @@ class QtCamera2 {
private void handleCaptureExposurePrecapture(CaptureResult result) {
Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
- if (aeState == null || aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
+ if (aeState == null ||
+ aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE ||
+ aeState == CaptureResult.CONTROL_AE_STATE_FLASH_REQUIRED) {
mState = STATE_WAITING_EXPOSURE_NON_PRECAPTURE;
}
}