fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-03-12 14:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

moving some code in if statement

Browse Source
This commit is contained in:
tibbi 2018-05-30 23:03:12 +02:00
parent 5c6d4132cb
commit b25beb3a34
1 changed files with 10 additions and 10 deletions

20
app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt

@ -385,16 +385,6 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
val characteristics = manager.getCameraCharacteristics(mCameraId) val characteristics = manager.getCameraCharacteristics(mCameraId)
val sensorArraySize = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE) val sensorArraySize = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE)
val x = (mLastClickX / mTextureView.width) * sensorArraySize.height()
val y = (mLastClickY / mTextureView.height) * sensorArraySize.width()
val halfTouchWidth = 150
val halfTouchHeight = 150
val focusAreaTouch = MeteringRectangle(Math.max(x - halfTouchWidth, 0f).toInt(),
Math.max(y - halfTouchHeight, 0f).toInt(),
halfTouchWidth * 2,
halfTouchHeight * 2,
MeteringRectangle.METERING_WEIGHT_MAX - 1)
val captureCallbackHandler = object : CameraCaptureSession.CaptureCallback() { val captureCallbackHandler = object : CameraCaptureSession.CaptureCallback() {
override fun onCaptureCompleted(session: CameraCaptureSession, request: CaptureRequest, result: TotalCaptureResult) { override fun onCaptureCompleted(session: CameraCaptureSession, request: CaptureRequest, result: TotalCaptureResult) {
super.onCaptureCompleted(session, request, result) super.onCaptureCompleted(session, request, result)
@ -413,6 +403,16 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
mCaptureSession!!.capture(build(), captureCallbackHandler, mBackgroundHandler) mCaptureSession!!.capture(build(), captureCallbackHandler, mBackgroundHandler)
if (characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) >= 1) { if (characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) >= 1) {
val x = (mLastClickX / mTextureView.width) * sensorArraySize.height()
val y = (mLastClickY / mTextureView.height) * sensorArraySize.width()
val halfTouchWidth = 150
val halfTouchHeight = 150
val focusAreaTouch = MeteringRectangle(Math.max(x - halfTouchWidth, 0f).toInt(),
Math.max(y - halfTouchHeight, 0f).toInt(),
halfTouchWidth * 2,
halfTouchHeight * 2,
MeteringRectangle.METERING_WEIGHT_MAX - 1)
set(CaptureRequest.CONTROL_AF_REGIONS, arrayOf(focusAreaTouch)) set(CaptureRequest.CONTROL_AF_REGIONS, arrayOf(focusAreaTouch))
} }