diff options
| author | Jarkko Koivikko <[email protected]> | 2025-05-04 16:16:35 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2025-05-29 04:58:13 +0000 |
| commit | 26624e5522b7dfff2f9082705fa8278868fa2983 (patch) | |
| tree | 83008509a677485d58e0e45f0f3beeebed306fe0 | |
| parent | eb68fb41b719ab79f9f5b87d46f285fc820dca9c (diff) | |
Previously, the image capture pipeline could stall indefinitely if the
camera reported CONTROL_AE_STATE_FLASH_REQUIRED during the exposure
precapture phase.
Change-Id: I051af3aa0b47c7da2abea25c714c84216e7b0ed8
Reviewed-by: Tim Blechmann <[email protected]>
Reviewed-by: Bartlomiej Moskal <[email protected]>
(cherry picked from commit 73249c76a971ac08885d77a0c82246a5c1842a88)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit 51d0c955730ce550a33713f3f00b9ae65042b9c0)
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/multimedia/QtCamera2.java | 4 |
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; } } |