Compare commits
2 Commits
main
...
loewy/fix-
| Author | SHA1 | Date | |
|---|---|---|---|
| 3bb72d5d94 | |||
| ac5dac127f |
@@ -235,10 +235,15 @@ class PersistentCameraCaptureSession(private val cameraManager: CameraManager, p
|
|||||||
|
|
||||||
// 1. Run a precapture sequence for AF, AE and AWB.
|
// 1. Run a precapture sequence for AF, AE and AWB.
|
||||||
focusJob = coroutineScope.launch {
|
focusJob = coroutineScope.launch {
|
||||||
val request = repeatingRequest.createCaptureRequest(device, deviceDetails, outputs)
|
try {
|
||||||
val options =
|
val request = repeatingRequest.createCaptureRequest(device, deviceDetails, outputs)
|
||||||
PrecaptureOptions(listOf(PrecaptureTrigger.AF, PrecaptureTrigger.AE), Flash.OFF, listOf(point), false, FOCUS_RESET_TIMEOUT)
|
val options =
|
||||||
session.precapture(request, deviceDetails, options)
|
PrecaptureOptions(listOf(PrecaptureTrigger.AF, PrecaptureTrigger.AE), Flash.OFF, listOf(point), false, FOCUS_RESET_TIMEOUT)
|
||||||
|
session.precapture(request, deviceDetails, options)
|
||||||
|
} catch (e: CaptureTimedOutError) {
|
||||||
|
// Focus timed out - this is non-fatal, just log and continue
|
||||||
|
Log.w(TAG, "Focus timed out at point $point, continuing without focus lock")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
focusJob?.join()
|
focusJob?.join()
|
||||||
|
|
||||||
|
|||||||
@@ -198,8 +198,10 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
|
|||||||
val viewOrientation = Orientation.PORTRAIT
|
val viewOrientation = Orientation.PORTRAIT
|
||||||
|
|
||||||
val rotated = point.rotatedBy(viewSize, cameraSize, viewOrientation, sensorOrientation)
|
val rotated = point.rotatedBy(viewSize, cameraSize, viewOrientation, sensorOrientation)
|
||||||
Log.i(TAG, "Converted layer point $point to camera point $rotated! ($sensorOrientation, $cameraSize -> $viewSize)")
|
// Clamp to valid camera coordinates (must be non-negative for MeteringRectangle)
|
||||||
return rotated
|
val clamped = Point(maxOf(0, rotated.x), maxOf(0, rotated.y))
|
||||||
|
Log.i(TAG, "Converted layer point $point to camera point $clamped! ($sensorOrientation, $cameraSize -> $viewSize)")
|
||||||
|
return clamped
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun updateLayout() {
|
private fun updateLayout() {
|
||||||
|
|||||||
Reference in New Issue
Block a user